Changeset 124297 in webkit

Timestamp:

Jul 31, 2012, 9:48:22 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

-webkit-flex-flow does not work with inherit/initial values
​https://bugs.webkit.org/show_bug.cgi?id=92709

Patch by Douglas Stockwell <​dstockwell@chromium.org> on 2012-07-31
Reviewed by Ojan Vafai.

Source/WebCore:

Add a new handler for flex-flow and move flex to StyleBuilder to mirror the standard pattern for handling initial/inherit in shorthands.

Test: css3/flexbox/flex-flow-initial.html

• css/StyleBuilder.cpp:

(WebCore::StyleBuilder::StyleBuilder): Added handlers for flex and flex-flow.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList): Removed hand written logic for handling flex.

LayoutTests:

Test that flex-flow handles 'initial' as expected.

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-31  Douglas Stockwell  <dstockwell@chromium.org>
+
+        -webkit-flex-flow does not work with inherit/initial values
+        https://bugs.webkit.org/show_bug.cgi?id=92709
+
+        Reviewed by Ojan Vafai.
+
+        Test that flex-flow handles 'initial' as expected.
+
+        * css3/flexbox/flex-flow-initial-expected.txt: Added.
+        * css3/flexbox/flex-flow-initial.html: Added.
+
 2012-07-31  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-31  Douglas Stockwell  <dstockwell@chromium.org>
+
+        -webkit-flex-flow does not work with inherit/initial values
+        https://bugs.webkit.org/show_bug.cgi?id=92709
+
+        Reviewed by Ojan Vafai.
+
+        Add a new handler for flex-flow and move flex to StyleBuilder to mirror the standard pattern for handling initial/inherit in shorthands.
+
+        Test: css3/flexbox/flex-flow-initial.html
+
+        * css/StyleBuilder.cpp:
+        (WebCore::StyleBuilder::StyleBuilder): Added handlers for flex and flex-flow.
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::collectMatchingRulesForList): Removed hand written logic for handling flex.
+
 2012-07-31  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/css/StyleBuilder.cpp

@@ -1991 +1991 @@
     setPropertyHandler(CSSPropertyWebkitAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
     setPropertyHandler(CSSPropertyWebkitAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitFlex, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
+    setPropertyHandler(CSSPropertyWebkitFlexFlow, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
     setPropertyHandler(CSSPropertyWebkitFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -4002 +4002 @@
     }
 #endif
-#if ENABLE(CSS3_FLEXBOX)
-    case CSSPropertyWebkitFlex:
-        if (isInherit) {
-            m_style->setFlexGrow(m_parentStyle->flexGrow());
-            m_style->setFlexShrink(m_parentStyle->flexShrink());
-            m_style->setFlexBasis(m_parentStyle->flexBasis());
-        } else if (isInitial) {
-            m_style->setFlexGrow(RenderStyle::initialFlexGrow());
-            m_style->setFlexShrink(RenderStyle::initialFlexShrink());
-            m_style->setFlexBasis(RenderStyle::initialFlexBasis());
-        }
-        return;
-#endif
     case CSSPropertyInvalid:
         return;
@@ -4345 +4332 @@
     case CSSPropertyWebkitAlignItems:
     case CSSPropertyWebkitAlignSelf:
+    case CSSPropertyWebkitFlex:
     case CSSPropertyWebkitFlexBasis:
     case CSSPropertyWebkitFlexDirection: