Changeset 140913 in webkit

Timestamp:

Jan 26, 2013 11:29:18 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Text Autosizing: simplify and clean-up preOrderTraversal skipping containers
​https://bugs.webkit.org/show_bug.cgi?id=107446

Patch by Tim Volodine <​timvolodine@chromium.org> on 2013-01-26
Reviewed by Julien Chaffraix.

Simplify nextInPreOrderSkippingDescendantsOfContainers implementation
using RenderObject tree traversal methods.

No new tests because functionality is unchanged.

• rendering/TextAutosizer.cpp:

(WebCore::TextAutosizer::nextInPreOrderSkippingDescendantsOfContainers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/TextAutosizer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-26  Tim Volodine  <timvolodine@chromium.org>
+
+        Text Autosizing: simplify and clean-up preOrderTraversal skipping containers
+        https://bugs.webkit.org/show_bug.cgi?id=107446
+
+        Reviewed by Julien Chaffraix.
+
+        Simplify nextInPreOrderSkippingDescendantsOfContainers implementation
+        using RenderObject tree traversal methods.
+
+        No new tests because functionality is unchanged.
+
+        * rendering/TextAutosizer.cpp:
+        (WebCore::TextAutosizer::nextInPreOrderSkippingDescendantsOfContainers):
+
 2013-01-26  Dan Carney  <dcarney@google.com>
 

trunk/Source/WebCore/rendering/TextAutosizer.cpp

@@ -408 +408 @@
 {
     if (current == stayWithin || !isAutosizingContainer(current))
-        for (RenderObject* child = current->firstChild(); child; child = child->nextSibling())
-            return child;
-
-    for (const RenderObject* ancestor = current; ancestor; ancestor = ancestor->parent()) {
-        if (ancestor == stayWithin)
-            return 0;
-        for (RenderObject* sibling = ancestor->nextSibling(); sibling; sibling = sibling->nextSibling())
-            return sibling;
-    }
-
-    return 0;
+        return current->nextInPreOrder(stayWithin);
+    return current->nextInPreOrderAfterChildren(stayWithin);
 }