Changeset 106704 in webkit

Timestamp:

Feb 3, 2012 4:10:18 PM (12 years ago)

Author:

tony@chromium.org

Message:

positive and negative flex values are not being cleared on style changes
​https://bugs.webkit.org/show_bug.cgi?id=77771

Reviewed by Ojan Vafai.

Source/WebCore:

If the width or height was a flex() value, but is no longer a flex
value, we weren't clearing the positive and negative flex values in
RenderStyle.

Test: css3/flexbox/flex-no-flex.html

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyLength::applyValue):

LayoutTests:

• css3/flexbox/flex-no-flex-expected.txt: Added.
• css3/flexbox/flex-no-flex.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-no-flex-expected.txt (added)
• LayoutTests/css3/flexbox/flex-no-flex.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleApplyProperty.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-03  Tony Chang  <tony@chromium.org>
+
+        positive and negative flex values are not being cleared on style changes
+        https://bugs.webkit.org/show_bug.cgi?id=77771
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/flex-no-flex-expected.txt: Added.
+        * css3/flexbox/flex-no-flex.html: Added.
+
 2012-02-03  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Tony Chang  <tony@chromium.org>
+
+        positive and negative flex values are not being cleared on style changes
+        https://bugs.webkit.org/show_bug.cgi?id=77771
+
+        Reviewed by Ojan Vafai.
+
+        If the width or height was a flex() value, but is no longer a flex
+        value, we weren't clearing the positive and negative flex values in
+        RenderStyle.
+
+        Test: css3/flexbox/flex-no-flex.html
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyLength::applyValue):
+
 2012-02-03  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -350 +350 @@
     static void applyValue(CSSStyleSelector* selector, CSSValue* value)
     {
+        float positiveFlex = 0;
+        float negativeFlex = 0;
         if (!value->isPrimitiveValue()) {
             if (!flexDirection || !value->isFlexValue())
@@ -357 +359 @@
             value = flexValue->preferredSize();
 
-            if (flexDirection == FlexWidth) {
-                selector->style()->setFlexboxWidthPositiveFlex(flexValue->positiveFlex());
-                selector->style()->setFlexboxWidthNegativeFlex(flexValue->negativeFlex());
-            } else if (flexDirection == FlexHeight) {
-                selector->style()->setFlexboxHeightPositiveFlex(flexValue->positiveFlex());
-                selector->style()->setFlexboxHeightNegativeFlex(flexValue->negativeFlex());
-            }
+            positiveFlex = flexValue->positiveFlex();
+            negativeFlex = flexValue->negativeFlex();
+        }
+
+        if (flexDirection == FlexWidth) {
+            selector->style()->setFlexboxWidthPositiveFlex(positiveFlex);
+            selector->style()->setFlexboxWidthNegativeFlex(negativeFlex);
+        } else if (flexDirection == FlexHeight) {
+            selector->style()->setFlexboxHeightPositiveFlex(positiveFlex);
+            selector->style()->setFlexboxHeightNegativeFlex(negativeFlex);
         }