Changeset 96159 in webkit

Timestamp:

Sep 27, 2011 2:45:54 PM (13 years ago)

Author:

ojan@chromium.org

Message:

take padding/border on flexbox into account with direction:rtl
​https://bugs.webkit.org/show_bug.cgi?id=68846

Reviewed by David Hyatt.

Source/WebCore:

Use the logicalWidth of the flexbox instead of it's availableLogicalWidth
so that we include the flexbox's border and padding.

Also, change all uses of availableLogicalWidth to contentLogicalWidth.
The former takes multi-column into account. Multi-column flexboxes don't
make any sense, so there's no point in calling availableLogicalWidth.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::flowAwareLogicalWidth):
(WebCore::RenderFlexibleBox::flowAwareContentLogicalWidth):
(WebCore::RenderFlexibleBox::computePreferredLogicalWidth):
(WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithmInlineDirection):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection):

• rendering/RenderFlexibleBox.h:

LayoutTests:

• css3/flexbox/writing-modes-expected.txt:
• css3/flexbox/writing-modes.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/writing-modes-expected.txt (modified) (1 diff)
• LayoutTests/css3/flexbox/writing-modes.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (5 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-27  Ojan Vafai  <ojan@chromium.org>
+
+        take padding/border on flexbox into account with direction:rtl
+        https://bugs.webkit.org/show_bug.cgi?id=68846
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/writing-modes-expected.txt:
+        * css3/flexbox/writing-modes.html:
+
 2011-09-27  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/css3/flexbox/writing-modes-expected.txt

@@ +1 @@
+PASS
+PASS
 PASS
 PASS

trunk/LayoutTests/css3/flexbox/writing-modes.html

@@ -8 +8 @@
     width: 600px;
     display: -webkit-flexbox;
+    background-color: grey;
 }
 .flexbox div {
@@ -175 +176 @@
 </div>
 
+<div style="position: relative;">
+    <div data-expected-width="600" style="direction: rtl; display: -webkit-flexbox; margin-left: 10px; margin-right:20px;" class="flexbox">
+      <div data-expected-width="50" data-offset-x="510" style="width: -webkit-flex(1 0 0); margin: 0 auto;"></div>
+      <div data-expected-width="300" data-offset-x="160" style="width: -webkit-flex(2 0 0); padding: 0 100px;"></div>
+      <div data-expected-width="50" data-offset-x="10" style="width: -webkit-flex(1 0 0);margin-right: 100px;"></div>
+    </div>
+</div>
+
+<div style="position: relative;">
+    <div data-expected-width="700" style="direction: rtl; display: -webkit-flexbox; padding-left: 10px; padding-right: 20px; border-style: solid; border-left: 30px solid; border-right: 40px solid;" class="flexbox ">
+      <div data-expected-width="50" data-offset-x="540" style="width: -webkit-flex(1 0 0); margin: 0 auto;"></div>
+      <div data-expected-width="300" data-offset-x="190" style="width: -webkit-flex(2 0 0); padding: 0 100px;"></div>
+      <div data-expected-width="50" data-offset-x="40" style="width: -webkit-flex(1 0 0);margin-right: 100px;"></div>
+    </div>
+</div>
+
 </body>
 </html>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  Ojan Vafai  <ojan@chromium.org>
+
+        take padding/border on flexbox into account with direction:rtl
+        https://bugs.webkit.org/show_bug.cgi?id=68846
+
+        Reviewed by David Hyatt.
+
+        Use the logicalWidth of the flexbox instead of it's availableLogicalWidth
+        so that we include the flexbox's border and padding.
+        
+        Also, change all uses of availableLogicalWidth to contentLogicalWidth.
+        The former takes multi-column into account. Multi-column flexboxes don't
+        make any sense, so there's no point in calling availableLogicalWidth.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::flowAwareLogicalWidth):
+        (WebCore::RenderFlexibleBox::flowAwareContentLogicalWidth):
+        (WebCore::RenderFlexibleBox::computePreferredLogicalWidth):
+        (WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithmInlineDirection):
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection):
+        * rendering/RenderFlexibleBox.h:
+
 2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -230 +230 @@
 }
 
+LayoutUnit RenderFlexibleBox::flowAwareLogicalWidth() const
+{
+    return logicalWidth();
+}
+
 LayoutUnit RenderFlexibleBox::flowAwareContentLogicalWidth() const
 {
     return contentLogicalWidth();
-}
-
-LayoutUnit RenderFlexibleBox::flowAwareAvailableLogicalWidth() const
-{
-    return availableLogicalWidth();
 }
 
@@ -375 +375 @@
     totalPositiveFlexibility = totalNegativeFlexibility = 0;
 
-    LayoutUnit flexboxAvailableLogicalWidth = flowAwareAvailableLogicalWidth();
+    LayoutUnit flexboxAvailableLogicalWidth = flowAwareContentLogicalWidth();
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
         // We always have to lay out flexible objects again, since the flex distribution
@@ -411 +411 @@
     childSizes.clear();
 
-    LayoutUnit flexboxAvailableLogicalWidth = flowAwareAvailableLogicalWidth();
+    LayoutUnit flexboxAvailableLogicalWidth = flowAwareContentLogicalWidth();
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
         LayoutUnit childPreferredSize;
@@ -475 +475 @@
 
     LayoutUnit logicalTop = flowAwareBorderBefore() + flowAwarePaddingBefore();
-    LayoutUnit totalAvailableLogicalWidth = flowAwareAvailableLogicalWidth();
+    LayoutUnit totalLogicalWidth = flowAwareLogicalWidth();
     setFlowAwareLogicalHeight(0);
     size_t i = 0;
@@ -495 +495 @@
 
         LayoutUnit childLogicalWidth = flowAwareLogicalWidthForChild(child);
-        LayoutUnit logicalLeft = isLeftToRightFlow() ? startEdge : totalAvailableLogicalWidth - startEdge - childLogicalWidth;
+        LayoutUnit logicalLeft = isLeftToRightFlow() ? startEdge : totalLogicalWidth - startEdge - childLogicalWidth;
         // FIXME: Do repaintDuringLayoutIfMoved.
         // FIXME: Supporting layout deltas.

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -61 +61 @@
     LayoutUnit flowAwareLogicalWidthForChild(RenderBox* child);
     LayoutUnit flowAwareLogicalHeight() const;
+    LayoutUnit flowAwareLogicalWidth() const;
     LayoutUnit flowAwareContentLogicalWidth() const;
-    LayoutUnit flowAwareAvailableLogicalWidth() const;
     LayoutUnit flowAwareBorderStart() const;
     LayoutUnit flowAwareBorderBefore() const;