<!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>[178597] trunk/Source/WebCore</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/178597">178597</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-16 13:33:01 -0800 (Fri, 16 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Page::editorClient() should return a reference.
&lt;https://webkit.org/b/140552&gt;

Reviewed by Chris Dumez.

Page always has an EditorClient, so make editorClient() return a reference.

* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::editorClient):
(WebCore::AlternativeTextController::textChecker):
* editing/Editor.cpp:
(WebCore::Editor::client):
* editing/SpellChecker.cpp:
(WebCore::SpellChecker::client):
* page/FocusController.cpp:
(WebCore::FocusController::setFocusedElement):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::~Page):
(WebCore::Page::clearUndoRedoOperations):
* page/Page.h:
(WebCore::Page::editorClient):
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSpellCheckercpp">trunk/Source/WebCore/editing/SpellChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/ChangeLog        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-16  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Page::editorClient() should return a reference.
+        &lt;https://webkit.org/b/140552&gt;
+
+        Reviewed by Chris Dumez.
+
+        Page always has an EditorClient, so make editorClient() return a reference.
+
+        * editing/AlternativeTextController.cpp:
+        (WebCore::AlternativeTextController::editorClient):
+        (WebCore::AlternativeTextController::textChecker):
+        * editing/Editor.cpp:
+        (WebCore::Editor::client):
+        * editing/SpellChecker.cpp:
+        (WebCore::SpellChecker::client):
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setFocusedElement):
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        (WebCore::Page::~Page):
+        (WebCore::Page::clearUndoRedoOperations):
+        * page/Page.h:
+        (WebCore::Page::editorClient):
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+
</ins><span class="cx"> 2015-01-16  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Make URL filters case-insensitive by default
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -505,14 +505,14 @@
</span><span class="cx"> 
</span><span class="cx"> EditorClient* AlternativeTextController::editorClient()
</span><span class="cx"> {
</span><del>-    return m_frame.page() ? m_frame.page()-&gt;editorClient() : 0;
</del><ins>+    return m_frame.page() ? &amp;m_frame.page()-&gt;editorClient() : nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TextCheckerClient* AlternativeTextController::textChecker()
</span><span class="cx"> {
</span><span class="cx">     if (EditorClient* owner = editorClient())
</span><span class="cx">         return owner-&gt;textChecker();
</span><del>-    return 0;
</del><ins>+    return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void AlternativeTextController::recordAutocorrectionResponseReversed(const String&amp; replacedString, const String&amp; replacementString)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/editing/Editor.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -171,11 +171,10 @@
</span><span class="cx"> EditorClient* Editor::client() const
</span><span class="cx"> {
</span><span class="cx">     if (Page* page = m_frame.page())
</span><del>-        return page-&gt;editorClient();
-    return 0;
</del><ins>+        return &amp;page-&gt;editorClient();
+    return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> TextCheckerClient* Editor::textChecker() const
</span><span class="cx"> {
</span><span class="cx">     if (EditorClient* owner = client())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSpellCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SpellChecker.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SpellChecker.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/editing/SpellChecker.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> {
</span><span class="cx">     Page* page = m_frame.page();
</span><span class="cx">     if (!page)
</span><del>-        return 0;
-    return page-&gt;editorClient()-&gt;textChecker();
</del><ins>+        return nullptr;
+    return page-&gt;editorClient().textChecker();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SpellChecker::timerFiredToProcessQueuedRequest()
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/page/FocusController.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -597,21 +597,21 @@
</span><span class="cx">     if (oldFocusedElement &amp;&amp; oldFocusedElement-&gt;isRootEditableElement() &amp;&amp; !relinquishesEditingFocus(oldFocusedElement))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    m_page.editorClient()-&gt;willSetInputMethodState();
</del><ins>+    m_page.editorClient().willSetInputMethodState();
</ins><span class="cx"> 
</span><span class="cx">     clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), element);
</span><span class="cx"> 
</span><span class="cx">     if (!element) {
</span><span class="cx">         if (oldDocument)
</span><span class="cx">             oldDocument-&gt;setFocusedElement(nullptr);
</span><del>-        m_page.editorClient()-&gt;setInputMethodState(false);
</del><ins>+        m_page.editorClient().setInputMethodState(false);
</ins><span class="cx">         return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     Ref&lt;Document&gt; newDocument(element-&gt;document());
</span><span class="cx"> 
</span><span class="cx">     if (newDocument-&gt;focusedElement() == element) {
</span><del>-        m_page.editorClient()-&gt;setInputMethodState(element-&gt;shouldUseInputMethod());
</del><ins>+        m_page.editorClient().setInputMethodState(element-&gt;shouldUseInputMethod());
</ins><span class="cx">         return true;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     if (newDocument-&gt;focusedElement() == element)
</span><del>-        m_page.editorClient()-&gt;setInputMethodState(element-&gt;shouldUseInputMethod());
</del><ins>+        m_page.editorClient().setInputMethodState(element-&gt;shouldUseInputMethod());
</ins><span class="cx"> 
</span><span class="cx">     m_focusSetTime = monotonicallyIncreasingTime();
</span><span class="cx">     m_focusRepaintTimer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/page/Page.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">     , m_backForwardController(std::make_unique&lt;BackForwardController&gt;(*this, pageConfiguration.backForwardClient))
</span><span class="cx">     , m_mainFrame(MainFrame::create(*this, pageConfiguration))
</span><span class="cx">     , m_theme(RenderTheme::themeForPage(this))
</span><del>-    , m_editorClient(pageConfiguration.editorClient)
</del><ins>+    , m_editorClient(*pageConfiguration.editorClient)
</ins><span class="cx">     , m_plugInClient(pageConfiguration.plugInClient)
</span><span class="cx">     , m_validationMessageClient(pageConfiguration.validationMessageClient)
</span><span class="cx">     , m_subframeCount(0)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">         frame-&gt;detachFromPage();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_editorClient-&gt;pageDestroyed();
</del><ins>+    m_editorClient.pageDestroyed();
</ins><span class="cx">     if (m_plugInClient)
</span><span class="cx">         m_plugInClient-&gt;pageDestroyed();
</span><span class="cx">     if (m_alternativeTextClient)
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx"> 
</span><span class="cx"> void Page::clearUndoRedoOperations()
</span><span class="cx"> {
</span><del>-    m_editorClient-&gt;clearUndoRedoOperations();
</del><ins>+    m_editorClient.clearUndoRedoOperations();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool Page::inLowQualityImageInterpolationMode() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/page/Page.h        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">     WEBCORE_EXPORT void setCanStartMedia(bool);
</span><span class="cx">     bool canStartMedia() const { return m_canStartMedia; }
</span><span class="cx"> 
</span><del>-    EditorClient* editorClient() const { return m_editorClient; }
</del><ins>+    EditorClient&amp; editorClient() { return m_editorClient; }
</ins><span class="cx">     PlugInClient* plugInClient() const { return m_plugInClient; }
</span><span class="cx"> 
</span><span class="cx">     MainFrame&amp; mainFrame() { ASSERT(m_mainFrame); return *m_mainFrame; }
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;RenderTheme&gt; m_theme;
</span><span class="cx"> 
</span><del>-    EditorClient* m_editorClient;
</del><ins>+    EditorClient&amp; m_editorClient;
</ins><span class="cx">     PlugInClient* m_plugInClient;
</span><span class="cx">     ValidationMessageClient* m_validationMessageClient;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (178596 => 178597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp        2015-01-16 21:25:50 UTC (rev 178596)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp        2015-01-16 21:33:01 UTC (rev 178597)
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx">         scrollableArea-&gt;scrollToOffsetWithoutAnimation(scrollPosition);
</span><span class="cx">         scrollableArea-&gt;setIsUserScroll(false);
</span><span class="cx">         if (scrollingLayerPositionAction == SetScrollingLayerPosition)
</span><del>-            m_page-&gt;editorClient()-&gt;overflowScrollPositionChanged();
</del><ins>+            m_page-&gt;editorClient().overflowScrollPositionChanged();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>