Changeset 83679 in webkit

Timestamp:

Apr 12, 2011 6:35:24 PM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

Rename onEndChain and make it a static method.
​https://bugs.webkit.org/show_bug.cgi?id=58403

Reviewed by Eric Seidel.

No new tests since this is refactoring only.

• rendering/InlineFlowBox.cpp:

(WebCore::isLastChildForRenderer):
(WebCore::InlineFlowBox::determineSpacingForFlowBoxes):

• rendering/InlineFlowBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/InlineFlowBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Rename onEndChain and make it a static method.
+        https://bugs.webkit.org/show_bug.cgi?id=58403
+
+        No new tests since this is refactoring only.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::isLastChildForRenderer):
+        (WebCore::InlineFlowBox::determineSpacingForFlowBoxes):
+        * rendering/InlineFlowBox.h:
+
 2011-04-12  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -253 +253 @@
 }
 
-bool InlineFlowBox::onEndChain(RenderObject* endObject)
-{
-    if (!endObject)
+static inline bool isLastChildForRenderer(RenderObject* ancestor, RenderObject* child)
+{
+    if (!child)
         return false;
     
-    if (endObject == renderer())
+    if (child == ancestor)
         return true;
 
-    RenderObject* curr = endObject;
+    RenderObject* curr = child;
     RenderObject* parent = curr->parent();
     while (parent && (!parent->isRenderBlock() || parent->isInline())) {
         if (parent->lastChild() != curr)
             return false;
-        if (parent == renderer())
+        if (parent == ancestor)
             return true;
             
@@ -310 +310 @@
         if (!lineBoxList->lastLineBox()->isConstructed()) {
             RenderInline* inlineFlow = toRenderInline(renderer());
-            bool isLastObjectOnLine = !isAnsectorAndWithinBlock(renderer(), logicallyLastRunRenderer) || (onEndChain(logicallyLastRunRenderer) && !isLogicallyLastRunWrapped);
+            bool isLastObjectOnLine = !isAnsectorAndWithinBlock(renderer(), logicallyLastRunRenderer) || (isLastChildForRenderer(renderer(), logicallyLastRunRenderer) && !isLogicallyLastRunWrapped);
 
             // We include the border under these conditions:

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -162 +162 @@
     void determineSpacingForFlowBoxes(bool lastLine, bool isLogicallyLastRunWrapped, RenderObject* logicallyLastRunRenderer);
     int getFlowSpacingLogicalWidth();
-    bool onEndChain(RenderObject* endObject);
     float placeBoxesInInlineDirection(float logicalLeft, bool& needsWordSpacing, GlyphOverflowAndFallbackFontsMap&);
     void computeLogicalBoxHeights(RootInlineBox*, int& maxPositionTop, int& maxPositionBottom,