Changeset 173549 in webkit

Timestamp:

Sep 11, 2014, 5:40:09 PM (12 years ago)

Author:

Chris Dumez

Message:

Simplify DOM tree traversal in FrameSelection::setSelectionFromNone()
​https://bugs.webkit.org/show_bug.cgi?id=136763

Reviewed by Ryosuke Niwa.

We only need to traverse the direct children of the Document element to
find the body. The previous code was potentially traversing descendants.
The new code is consistent with Document::body() except that we only
look for an HTMLBodyElement (and ignore HTMLFrameSetElement).

Also update the code to use tighter typing for clarity.

No new tests, no behavior change.

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setSelectionFromNone):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Chris Dumez  <cdumez@apple.com>
+
+        Simplify DOM tree traversal in FrameSelection::setSelectionFromNone()
+        https://bugs.webkit.org/show_bug.cgi?id=136763
+
+        Reviewed by Ryosuke Niwa.
+
+        We only need to traverse the direct children of the Document element to
+        find the body. The previous code was potentially traversing descendants.
+        The new code is consistent with Document::body() except that we only
+        look for an HTMLBodyElement (and ignore HTMLFrameSetElement).
+
+        Also update the code to use tighter typing for clarity.
+
+        No new tests, no behavior change.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setSelectionFromNone):
+
 2014-09-11  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -42 +42 @@
 #include "FrameView.h"
 #include "GraphicsContext.h"
+#include "HTMLBodyElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLFrameElementBase.h"
@@ -2112 +2113 @@
 #endif
 
-    Node* node = document->documentElement();
-    while (node && !node->hasTagName(bodyTag))
-        node = NodeTraversal::next(node);
-    if (node)
-        setSelection(VisibleSelection(firstPositionInOrBeforeNode(node), DOWNSTREAM));
+    Element* documentElement = document->documentElement();
+    if (!documentElement)
+        return;
+    if (auto body = childrenOfType<HTMLBodyElement>(*documentElement).first())
+        setSelection(VisibleSelection(firstPositionInOrBeforeNode(body), DOWNSTREAM));
 }