<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197605] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197605">197605</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-03-04 17:35:12 -0800 (Fri, 04 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebKit2] Add WebKit2 equivalent of -[WebView _insertNewlineInQuotedContent]
<rdar://problem/24943591>
https://bugs.webkit.org/show_bug.cgi?id=155057
Reviewed by Tim Horton.
Source/WebCore:
Move Editor::insertParagraphSeparatorInQuotedContent() into Editor.cpp
and remove the duplicated code in EditorIOS.mm and EditorMac.mm.
* editing/Editor.cpp:
(WebCore::Editor::insertParagraphSeparatorInQuotedContent):
* editing/Editor.h:
* editing/ios/EditorIOS.mm:
(WebCore::Editor::insertParagraphSeparatorInQuotedContent): Deleted.
* editing/mac/EditorMac.mm:
(WebCore::Editor::insertParagraphSeparatorInQuotedContent): Deleted.
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageInsertNewlineInQuotedContent):
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::insertNewlineInQuotedContent):
* WebProcess/WebPage/WebPage.h:
Expose WKBundlePageInsertNewlineInQuotedContent as SPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebCore/ChangeLog 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-04 Sam Weinig <sam@webkit.org>
+
+ [WebKit2] Add WebKit2 equivalent of -[WebView _insertNewlineInQuotedContent]
+ <rdar://problem/24943591>
+ https://bugs.webkit.org/show_bug.cgi?id=155057
+
+ Reviewed by Tim Horton.
+
+ Move Editor::insertParagraphSeparatorInQuotedContent() into Editor.cpp
+ and remove the duplicated code in EditorIOS.mm and EditorMac.mm.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::insertParagraphSeparatorInQuotedContent):
+ * editing/Editor.h:
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::insertParagraphSeparatorInQuotedContent): Deleted.
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::insertParagraphSeparatorInQuotedContent): Deleted.
+
</ins><span class="cx"> 2016-03-04 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Convert DOMTimer interval from int to std::chromo::milliseconds
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebCore/editing/Editor.cpp 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -1234,6 +1234,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Editor::insertParagraphSeparatorInQuotedContent()
+{
+ // FIXME: Why is this missing calls to canEdit, canEditRichly, etc.?
+ TypingCommand::insertParagraphSeparatorInQuotedContent(document());
+ revealSelectionAfterEditingOperation();
+ return true;
+}
+
</ins><span class="cx"> void Editor::cut()
</span><span class="cx"> {
</span><span class="cx"> if (tryDHTMLCut())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebCore/editing/Editor.h 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -231,6 +231,7 @@
</span><span class="cx"> bool insertTextWithoutSendingTextEvent(const String&, bool selectInsertedText, TextEvent* triggeringEvent);
</span><span class="cx"> bool insertLineBreak();
</span><span class="cx"> bool insertParagraphSeparator();
</span><ins>+ WEBCORE_EXPORT bool insertParagraphSeparatorInQuotedContent();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isContinuousSpellCheckingEnabled() const;
</span><span class="cx"> WEBCORE_EXPORT void toggleContinuousSpellChecking();
</span><span class="lines">@@ -430,7 +431,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WEBCORE_EXPORT static RenderStyle* styleForSelectionStart(Frame* , Node *&nodeToRemove);
</span><span class="cx"> void getTextDecorationAttributesRespectingTypingStyle(RenderStyle&, NSMutableDictionary*) const;
</span><del>- WEBCORE_EXPORT bool insertParagraphSeparatorInQuotedContent();
</del><span class="cx"> WEBCORE_EXPORT const Font* fontForSelection(bool&) const;
</span><span class="cx"> WEBCORE_EXPORT NSDictionary *fontAttributesForSelectionStart() const;
</span><span class="cx"> WEBCORE_EXPORT String stringSelectionForPasteboard();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -175,14 +175,6 @@
</span><span class="cx"> applyParagraphStyle(style.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Editor::insertParagraphSeparatorInQuotedContent()
-{
- // FIXME: Why is this missing calls to canEdit, canEditRichly, etc...
- TypingCommand::insertParagraphSeparatorInQuotedContent(*m_frame.document());
- revealSelectionAfterEditingOperation();
- return true;
-}
-
</del><span class="cx"> const Font* Editor::fontForSelection(bool& hasMultipleFonts) const
</span><span class="cx"> {
</span><span class="cx"> hasMultipleFonts = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -101,14 +101,6 @@
</span><span class="cx"> client()->setInsertionPasteboard(String());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Editor::insertParagraphSeparatorInQuotedContent()
-{
- // FIXME: Why is this missing calls to canEdit, canEditRichly, etc.?
- TypingCommand::insertParagraphSeparatorInQuotedContent(document());
- revealSelectionAfterEditingOperation();
- return true;
-}
-
</del><span class="cx"> const Font* Editor::fontForSelection(bool& hasMultipleFonts) const
</span><span class="cx"> {
</span><span class="cx"> hasMultipleFonts = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-04 Sam Weinig <sam@webkit.org>
+
+ [WebKit2] Add WebKit2 equivalent of -[WebView _insertNewlineInQuotedContent]
+ <rdar://problem/24943591>
+ https://bugs.webkit.org/show_bug.cgi?id=155057
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageInsertNewlineInQuotedContent):
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::insertNewlineInQuotedContent):
+ * WebProcess/WebPage/WebPage.h:
+ Expose WKBundlePageInsertNewlineInQuotedContent as SPI.
+
</ins><span class="cx"> 2016-03-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Stub API to support a debug menu option for measuring resource load statistics
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -223,6 +223,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKBundlePageInsertNewlineInQuotedContent(WKBundlePageRef pageRef)
+{
+ toImpl(pageRef)->insertNewlineInQuotedContent();
+}
+
</ins><span class="cx"> void* WKAccessibilityRootObject(WKBundlePageRef pageRef)
</span><span class="cx"> {
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -90,6 +90,8 @@
</span><span class="cx"> WK_EXPORT WKArrayRef WKBundlePageCopyContextMenuItems(WKBundlePageRef);
</span><span class="cx"> WK_EXPORT WKArrayRef WKBundlePageCopyContextMenuAtPointInWindow(WKBundlePageRef, WKPoint);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKBundlePageInsertNewlineInQuotedContent(WKBundlePageRef page);
+
</ins><span class="cx"> // This only works if the SuppressesIncrementalRendering preference is set as well.
</span><span class="cx"> typedef unsigned WKRenderingSuppressionToken;
</span><span class="cx"> WK_EXPORT WKRenderingSuppressionToken WKBundlePageExtendIncrementalRenderingSuppression(WKBundlePageRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -2347,6 +2347,14 @@
</span><span class="cx"> m_page->setControlledByAutomation(controlled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::insertNewlineInQuotedContent()
+{
+ Frame& frame = m_page->focusController().focusedOrMainFrame();
+ if (frame.selection().isNone())
+ return;
+ frame.editor().insertParagraphSeparatorInQuotedContent();
+}
+
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> void WebPage::setAllowsRemoteInspection(bool allow)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (197604 => 197605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-05 01:34:21 UTC (rev 197604)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-05 01:35:12 UTC (rev 197605)
</span><span class="lines">@@ -932,6 +932,8 @@
</span><span class="cx"> bool isControlledByAutomation() const;
</span><span class="cx"> void setControlledByAutomation(bool);
</span><span class="cx">
</span><ins>+ void insertNewlineInQuotedContent();
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPage(uint64_t pageID, const WebPageCreationParameters&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>