Changeset 83098 in webkit

Timestamp:

Apr 6, 2011 2:08:20 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-04-06 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

borderPaddingMarginStart and borderPaddingMarginEnd should take RenderInline
​https://bugs.webkit.org/show_bug.cgi?id=57965

Changed the argument types of borderPaddingMarginStart and borderPaddingMarginEnd
from RenderBoxModelObject to RenderInline since they call marginStart and marginEnd
instead of marginStartForChild and marginEndForChild respectively.

Calling these two functions on RenderInline is okay because writing-mode cannot differ
from that of the containing block.

• rendering/RenderBlockLineLayout.cpp: (WebCore::borderPaddingMarginStart): (WebCore::borderPaddingMarginEnd): (WebCore::inlineLogicalWidth):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        borderPaddingMarginStart and borderPaddingMarginEnd should take RenderInline
+        https://bugs.webkit.org/show_bug.cgi?id=57965
+
+        Changed the argument types of borderPaddingMarginStart and borderPaddingMarginEnd
+        from RenderBoxModelObject to RenderInline since they call marginStart and marginEnd
+        instead of marginStartForChild and marginEndForChild respectively.
+
+        Calling these two functions on RenderInline is okay because writing-mode cannot differ
+        from that of the containing block.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::borderPaddingMarginStart):
+        (WebCore::borderPaddingMarginEnd):
+        (WebCore::inlineLogicalWidth):
+
 2011-04-06  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -61 +61 @@
 const unsigned cMaxLineDepth = 200;
 
-static inline int borderPaddingMarginStart(RenderBoxModelObject* child)
-{
-    // FIXME: Should we call marginStartForChild instead?
+static inline int borderPaddingMarginStart(RenderInline* child)
+{
     return child->marginStart() + child->paddingStart() + child->borderStart();
 }
 
-static inline int borderPaddingMarginEnd(RenderBoxModelObject* child)
+static inline int borderPaddingMarginEnd(RenderInline* child)
 {
     return child->marginEnd() + child->paddingEnd() + child->borderEnd();
@@ -77 +76 @@
     int extraWidth = 0;
     RenderObject* parent = child->parent();
-    while (parent->isInline() && !parent->isInlineBlockOrInlineTable() && lineDepth++ < cMaxLineDepth) {
-        RenderBoxModelObject* parentAsBoxModelObject = toRenderBoxModelObject(parent);
-        ASSERT(parentAsBoxModelObject);
+    while (parent->isRenderInline() && lineDepth++ < cMaxLineDepth) {
+        RenderInline* parentAsRenderInline = toRenderInline(parent);
         if (start && !child->previousSibling())
-            extraWidth += borderPaddingMarginStart(parentAsBoxModelObject);
+            extraWidth += borderPaddingMarginStart(parentAsRenderInline);
         if (end && !child->nextSibling())
-            extraWidth += borderPaddingMarginEnd(parentAsBoxModelObject);
+            extraWidth += borderPaddingMarginEnd(parentAsRenderInline);
         child = parent;
         parent = child->parent();