Changeset 150642 in webkit

Timestamp:

May 24, 2013 9:18:16 AM (11 years ago)

Author:

robert@webkit.org

Message:

Refactor shouldAddBorderPaddingMargin()
​https://bugs.webkit.org/show_bug.cgi?id=98803

Reviewed by Ryosuke Niwa.

Make this helper function less clever-stupid in its misguided sacrifice of intelligibility
for the sake of concision.

No new tests, refactoring.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::shouldAddBorderPaddingMargin):
(WebCore::inlineLogicalWidth):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-24  Robert Hogan  <robert@webkit.org>
+
+        Refactor shouldAddBorderPaddingMargin()
+        https://bugs.webkit.org/show_bug.cgi?id=98803
+
+        Reviewed by Ryosuke Niwa.
+
+        Make this helper function less clever-stupid in its misguided sacrifice of intelligibility
+        for the sake of concision.
+
+        No new tests, refactoring.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::shouldAddBorderPaddingMargin):
+        (WebCore::inlineLogicalWidth):
+
 2013-05-24  Xiaobo Wang  <xiaobwang@blackberry.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -349 +349 @@
 }
 
-static bool shouldAddBorderPaddingMargin(RenderObject* child, bool &checkSide)
-{
-    if (!child || (child->isText() && !toRenderText(child)->textLength()))
-        return true;
-    checkSide = false;
-    return checkSide;
+static inline bool shouldAddBorderPaddingMargin(RenderObject* child)
+{
+    // When deciding whether we're at the edge of an inline, adjacent collapsed whitespace is the same as no sibling at all.
+    return !child || (child->isText() && !toRenderText(child)->textLength());
 }
 
@@ -365 +363 @@
 }
 
-static LayoutUnit inlineLogicalWidth(RenderObject* child, bool start = true, bool end = true)
+static LayoutUnit inlineLogicalWidth(RenderObject* child, bool checkStartEdge = true, bool checkEndEdge = true)
 {
     unsigned lineDepth = 1;
@@ -373 +371 @@
         RenderInline* parentAsRenderInline = toRenderInline(parent);
         if (!isEmptyInline(parentAsRenderInline)) {
-            if (start && shouldAddBorderPaddingMargin(previousInFlowSibling(child), start))
+            checkStartEdge = checkStartEdge && shouldAddBorderPaddingMargin(previousInFlowSibling(child));
+            if (checkStartEdge)
                 extraWidth += borderPaddingMarginStart(parentAsRenderInline);
-            if (end && shouldAddBorderPaddingMargin(child->nextSibling(), end))
+            checkEndEdge = checkEndEdge && shouldAddBorderPaddingMargin(child->nextSibling());
+            if (checkEndEdge)
                 extraWidth += borderPaddingMarginEnd(parentAsRenderInline);
-            if (!start && !end)
+            if (!checkStartEdge && !checkEndEdge)
                 return extraWidth;
         }