<!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>[158723] 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/158723">158723</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-05 22:14:47 -0800 (Tue, 05 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Change the order of conditions to avoid computing rendererIsEditable()
https://bugs.webkit.org/show_bug.cgi?id=123868

Reviewed by Andreas Kling.

Merge https://chromium.googlesource.com/chromium/blink/+/c89b413ff0fc4aafa0c71d180b0b1e131bb37707

When we need both Node::renderer() and Node::rendererIsEditable() conditions to be true to perform
some operation, it is more effective to check for renderer() first, so that if this condition fails
we can avoid unnecessary computation of rendererIsEditable().

* dom/Position.cpp:
(WebCore::nextRenderedEditable):
(WebCore::previousRenderedEditable):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMouseReleaseEvent):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158722 => 158723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-06 06:02:35 UTC (rev 158722)
+++ trunk/Source/WebCore/ChangeLog        2013-11-06 06:14:47 UTC (rev 158723)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-11-05  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        Change the order of conditions to avoid computing rendererIsEditable()
+        https://bugs.webkit.org/show_bug.cgi?id=123868
+
+        Reviewed by Andreas Kling.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/c89b413ff0fc4aafa0c71d180b0b1e131bb37707
+
+        When we need both Node::renderer() and Node::rendererIsEditable() conditions to be true to perform
+        some operation, it is more effective to check for renderer() first, so that if this condition fails
+        we can avoid unnecessary computation of rendererIsEditable().
+
+        * dom/Position.cpp:
+        (WebCore::nextRenderedEditable):
+        (WebCore::previousRenderedEditable):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+
+2013-11-05  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
</ins><span class="cx">         simpleUserAgentStyleSheet doesn't have focus ring on anchor element
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=123867
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (158722 => 158723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp        2013-11-06 06:02:35 UTC (rev 158722)
+++ trunk/Source/WebCore/dom/Position.cpp        2013-11-06 06:14:47 UTC (rev 158723)
</span><span class="lines">@@ -65,10 +65,8 @@
</span><span class="cx"> static Node* nextRenderedEditable(Node* node)
</span><span class="cx"> {
</span><span class="cx">     while ((node = nextLeafNode(node))) {
</span><del>-        if (!node-&gt;rendererIsEditable())
-            continue;
</del><span class="cx">         RenderObject* renderer = node-&gt;renderer();
</span><del>-        if (!renderer)
</del><ins>+        if (!renderer || !node-&gt;rendererIsEditable())
</ins><span class="cx">             continue;
</span><span class="cx">         if (hasInlineBoxWrapper(*renderer))
</span><span class="cx">             return node;
</span><span class="lines">@@ -79,10 +77,8 @@
</span><span class="cx"> static Node* previousRenderedEditable(Node* node)
</span><span class="cx"> {
</span><span class="cx">     while ((node = previousLeafNode(node))) {
</span><del>-        if (!node-&gt;rendererIsEditable())
-            continue;
</del><span class="cx">         RenderObject* renderer = node-&gt;renderer();
</span><del>-        if (!renderer)
</del><ins>+        if (!renderer || !node-&gt;rendererIsEditable())
</ins><span class="cx">             continue;
</span><span class="cx">         if (hasInlineBoxWrapper(*renderer))
</span><span class="cx">             return node;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (158722 => 158723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2013-11-06 06:02:35 UTC (rev 158722)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2013-11-06 06:14:47 UTC (rev 158723)
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx">         VisibleSelection newSelection;
</span><span class="cx">         Node* node = event.targetNode();
</span><span class="cx">         bool caretBrowsing = m_frame.settings().caretBrowsingEnabled();
</span><del>-        if (node &amp;&amp; (caretBrowsing || node-&gt;rendererIsEditable()) &amp;&amp; node-&gt;renderer()) {
</del><ins>+        if (node &amp;&amp; node-&gt;renderer() &amp;&amp; (caretBrowsing || node-&gt;rendererIsEditable())) {
</ins><span class="cx">             VisiblePosition pos = node-&gt;renderer()-&gt;positionForPoint(event.localPoint());
</span><span class="cx">             newSelection = VisibleSelection(pos);
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>