Changeset 84450 in webkit

Timestamp:

Apr 20, 2011 6:55:09 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-04-20 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Split out isIteratorTarget from bidiNext and bidiFirst
​https://bugs.webkit.org/show_bug.cgi?id=59033

This is the first (tiny) step of many. When I tried to
make larger changes to this function I broke stuff, so
doing this in tiny pieces so we know it's right.

• rendering/InlineIterator.h: (WebCore::isIteratorTarget): (WebCore::bidiNext): (WebCore::bidiFirstSkippingInlines): (WebCore::bidiFirstNotSkippingInlines):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineIterator.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Split out isIteratorTarget from bidiNext and bidiFirst
+        https://bugs.webkit.org/show_bug.cgi?id=59033
+
+        This is the first (tiny) step of many.  When I tried to
+        make larger changes to this function I broke stuff, so
+        doing this in tiny pieces so we know it's right.
+
+        * rendering/InlineIterator.h:
+        (WebCore::isIteratorTarget):
+        (WebCore::bidiNext):
+        (WebCore::bidiFirstSkippingInlines):
+        (WebCore::bidiFirstNotSkippingInlines):
+
 2011-04-20  Alexey Marinichev  <amarinichev@chromium.org>
 

trunk/Source/WebCore/rendering/InlineIterator.h

@@ -132 +132 @@
 }
 
+static inline bool isIteratorTarget(RenderObject* object)
+{
+    ASSERT(object); // The iterator will of course return 0, but its not an expected argument to this function.
+    return object->isText() || object->isFloating() || object->isPositioned() || object->isReplaced();
+}
+
 // FIXME: This function is misleadingly named. It has little to do with bidi.
 // This function will iterate over inlines within a block, optionally notifying
@@ -144 +150 @@
     while (current) {
         next = 0;
-        if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned() && !current->isText()) {
+        if (!oldEndOfInline && !isIteratorTarget(current)) {
             next = current->firstChild();
             notifyResolverEnteredObject(resolver, next);
@@ -179 +185 @@
             break;
 
-        if (next->isText() || next->isFloating() || next->isReplaced() || next->isPositioned()
+        if (isIteratorTarget(next)
             || ((!skipInlines || !next->firstChild()) // Always return EMPTY inlines.
                 && next->isRenderInline()))
@@ -212 +218 @@
 
     // FIXME: Unify this with the bidiNext call above.
-    if (o && !o->isText() && !o->isReplaced() && !o->isFloating() && !o->isPositioned())
+    if (o && !isIteratorTarget(o))
         o = bidiNext(root, o, resolver, true);
 
@@ -225 +231 @@
     // If either there are no children to walk, or the first one is correct
     // then just return it.
-    if (!o || o->isRenderInline() || o->isText() || o->isReplaced() || o->isFloating() || o->isPositioned())
+    if (!o || o->isRenderInline() || isIteratorTarget(o))
         return o;