Changeset 168279 in webkit

Timestamp:

May 5, 2014 4:32:34 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r167447 - Tidy up isIsolatedInline() and highestContainingIsolateWithinRoot()
<​http://webkit.org/b/131117>

Reviewed by Daniel Bates.

Based on review feedback for r166650.

• rendering/InlineIterator.h:

(WebCore::isIsolatedInline):

• Switch argument to a reference since it is never called with a nullptr.

(WebCore::highestContainingIsolateWithinRoot):

• Switch first argument to a reference since it's never a nullptr.
• Use nullptr for pointer initialization.
• Switch while() loop to for() loop. Pass reference to isIsolatedInline().

(WebCore::numberOfIsolateAncestors):

• Switch while() loop to for() loop. Pass reference to isIsolatedInline().
• rendering/RenderBlockLineLayout.cpp:

(WebCore::constructBidiRunsForSegment):

• Rename startObj to startObject.
• No longer need to pass the address of startObject here.

Location:

releases/WebKitGTK/webkit-2.4/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineIterator.h (modified) (2 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (3 diffs)

releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-17  David Kilzer  <ddkilzer@apple.com>
+
+        Tidy up isIsolatedInline() and highestContainingIsolateWithinRoot()
+        <http://webkit.org/b/131117>
+
+        Reviewed by Daniel Bates.
+
+        Based on review feedback for r166650.
+
+        * rendering/InlineIterator.h:
+        (WebCore::isIsolatedInline):
+        - Switch argument to a reference since it is never called with a
+          nullptr.
+        (WebCore::highestContainingIsolateWithinRoot):
+        - Switch first argument to a reference since it's never a
+          nullptr.
+        - Use nullptr for pointer initialization.
+        - Switch while() loop to for() loop. Pass reference to
+          isIsolatedInline().
+        (WebCore::numberOfIsolateAncestors):
+        - Switch while() loop to for() loop. Pass reference to
+          isIsolatedInline().
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::constructBidiRunsForSegment):
+        - Rename startObj to startObject.
+        - No longer need to pass the address of startObject here.
+
 2014-04-02  David Kilzer  <ddkilzer@apple.com>
 

releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/InlineIterator.h

@@ -409 +409 @@
 }
 
-static inline bool isIsolatedInline(RenderObject* object)
-{
-    ASSERT(object);
-    return object->isRenderInline() && isIsolated(object->style().unicodeBidi());
-}
-
-static inline RenderObject* highestContainingIsolateWithinRoot(RenderObject* object, RenderObject* root)
-{
-    ASSERT(object);
-    RenderObject* containingIsolateObject = 0;
-    while (object && object != root) {
-        if (isIsolatedInline(object))
+static inline bool isIsolatedInline(RenderObject& object)
+{
+    return object.isRenderInline() && isIsolated(object.style().unicodeBidi());
+}
+
+static inline RenderObject* highestContainingIsolateWithinRoot(RenderObject& initialObject, RenderObject* root)
+{
+    RenderObject* containingIsolateObject = nullptr;
+    for (RenderObject* object = &initialObject; object && object != root; object = object->parent()) {
+        if (isIsolatedInline(*object))
             containingIsolateObject = object;
-
-        object = object->parent();
     }
     return containingIsolateObject;
@@ -430 +426 @@
 static inline unsigned numberOfIsolateAncestors(const InlineIterator& iter)
 {
-    RenderObject* object = iter.renderer();
-    if (!object)
-        return 0;
     unsigned count = 0;
-    while (object && object != iter.root()) {
-        if (isIsolatedInline(object))
+    typedef RenderObject* RenderObjectPtr;
+    for (RenderObjectPtr object = iter.renderer(), root = iter.root(); object && object != root; object = object->parent()) {
+        if (isIsolatedInline(*object))
             count++;
-        object = object->parent();
     }
     return count;

releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -897 +897 @@
         topResolver.isolatedRuns().removeLast();
 
-        RenderObject& startObj = isolatedRun->renderer();
+        RenderObject& startObject = isolatedRun->renderer();
 
         // Only inlines make sense with unicode-bidi: isolate (blocks are already isolated).
@@ -904 +904 @@
         // to take a RenderObject and do this logic there, but that would be a layering
         // violation for BidiResolver (which knows nothing about RenderObject).
-        RenderInline* isolatedInline = toRenderInline(highestContainingIsolateWithinRoot(&startObj, currentRoot));
+        RenderInline* isolatedInline = toRenderInline(highestContainingIsolateWithinRoot(startObject, currentRoot));
         ASSERT(isolatedInline);
 
@@ -918 +918 @@
         isolatedResolver.setStatus(BidiStatus(direction, isOverride(unicodeBidi)));
 
-        setUpResolverToResumeInIsolate(isolatedResolver, isolatedInline, &startObj);
+        setUpResolverToResumeInIsolate(isolatedResolver, isolatedInline, &startObject);
 
         // The starting position is the beginning of the first run within the isolate that was identified
         // during the earlier call to createBidiRunsForLine. This can be but is not necessarily the
         // first run within the isolate.
-        InlineIterator iter = InlineIterator(isolatedInline, &startObj, isolatedRun->m_start);
+        InlineIterator iter = InlineIterator(isolatedInline, &startObject, isolatedRun->m_start);
         isolatedResolver.setPositionIgnoringNestedIsolates(iter);