Changeset 140290 in webkit

Timestamp:

Jan 20, 2013 6:40:03 PM (11 years ago)

Author:

tkent@chromium.org

Message:

Re-layout child blocks when border/padding of the box-sizing:border-box parent is updated
​https://bugs.webkit.org/show_bug.cgi?id=104997

Reviewed by Tony Chang.

Source/WebCore:

When padding or border is updated for a parent block with
box-sizing:border-box and width, the width of its child block was not
updated.

Tests: fast/css/box-sizing-border-box-dynamic-padding-border-update.html

fast/forms/text/text-padding-dynamic-change.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::styleDidChange):
If box-sizing of the old style and/or the new style is border-box and
padding or border is changed, apply setChildNeedsLayout(true) for child
boxes.

LayoutTests:

• fast/css/box-sizing-border-box-dynamic-padding-border-update-expected.txt: Added.
• fast/css/box-sizing-border-box-dynamic-padding-border-update.html: Added.
• fast/forms/text/text-padding-dynamic-change-expected.html: Added.
• fast/forms/text/text-padding-dynamic-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/box-sizing-border-box-dynamic-padding-border-update-expected.txt (added)
• LayoutTests/fast/css/box-sizing-border-box-dynamic-padding-border-update.html (added)
• LayoutTests/fast/forms/text (added)
• LayoutTests/fast/forms/text/text-padding-dynamic-change-expected.html (added)
• LayoutTests/fast/forms/text/text-padding-dynamic-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-20  Kent Tamura  <tkent@chromium.org>
+
+        Re-layout child blocks when border/padding of the box-sizing:border-box parent is updated
+        https://bugs.webkit.org/show_bug.cgi?id=104997
+
+        Reviewed by Tony Chang.
+
+        * fast/css/box-sizing-border-box-dynamic-padding-border-update-expected.txt: Added.
+        * fast/css/box-sizing-border-box-dynamic-padding-border-update.html: Added.
+        * fast/forms/text/text-padding-dynamic-change-expected.html: Added.
+        * fast/forms/text/text-padding-dynamic-change.html: Added.
+
 2013-01-20  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-20  Kent Tamura  <tkent@chromium.org>
+
+        Re-layout child blocks when border/padding of the box-sizing:border-box parent is updated
+        https://bugs.webkit.org/show_bug.cgi?id=104997
+
+        Reviewed by Tony Chang.
+
+        When padding or border is updated for a parent block with
+        box-sizing:border-box and width, the width of its child block was not
+        updated.
+
+        Tests: fast/css/box-sizing-border-box-dynamic-padding-border-update.html
+               fast/forms/text/text-padding-dynamic-change.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::styleDidChange):
+        If box-sizing of the old style and/or the new style is border-box and
+        padding or border is changed, apply setChildNeedsLayout(true) for child
+        boxes.
+
 2013-01-20  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -306 +306 @@
     updateExclusionShapeOutsideInfoAfterStyleChange(style()->shapeOutside(), oldStyle ? oldStyle->shapeOutside() : 0);
 #endif
+
+    if (oldStyle && (newStyle->boxSizing() == BORDER_BOX || oldStyle->boxSizing() == BORDER_BOX)
+        && (newStyle->paddingBox() != oldStyle->paddingBox() || newStyle->border() != oldStyle->border())) {
+        for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox())
+            child->setChildNeedsLayout(true, MarkOnlyThis);
+    }
 }