Changeset 158723 in webkit

Timestamp:

Nov 5, 2013 10:14:47 PM (10 years ago)

Author:

rniwa@webkit.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (2 diffs)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-05  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/Position.cpp

@@ -66 +66 @@
 {
     while ((node = nextLeafNode(node))) {
-        if (!node->rendererIsEditable())
-            continue;
         RenderObject* renderer = node->renderer();
-        if (!renderer)
+        if (!renderer || !node->rendererIsEditable())
             continue;
         if (hasInlineBoxWrapper(*renderer))
@@ -80 +78 @@
 {
     while ((node = previousLeafNode(node))) {
-        if (!node->rendererIsEditable())
-            continue;
         RenderObject* renderer = node->renderer();
-        if (!renderer)
+        if (!renderer || !node->rendererIsEditable())
             continue;
         if (hasInlineBoxWrapper(*renderer))

trunk/Source/WebCore/page/EventHandler.cpp

@@ -938 +938 @@
         Node* node = event.targetNode();
         bool caretBrowsing = m_frame.settings().caretBrowsingEnabled();
-        if (node && (caretBrowsing || node->rendererIsEditable()) && node->renderer()) {
+        if (node && node->renderer() && (caretBrowsing || node->rendererIsEditable())) {
             VisiblePosition pos = node->renderer()->positionForPoint(event.localPoint());
             newSelection = VisibleSelection(pos);