Changeset 91410 in webkit

Timestamp:

Jul 20, 2011 3:00:29 PM (13 years ago)

Author:

tony@chromium.org

Message:

Pass -webkit-flex() values on to RenderStyle
​https://bugs.webkit.org/show_bug.cgi?id=64038

Reviewed by Eric Seidel.

No new tests, this just copies data to RenderStyle, which we can
then access when doing layout. Tests will come with the layout
changes.

• css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyLength::applyValue):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleApplyProperty.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-20  Tony Chang  <tony@chromium.org>
+
+        Pass -webkit-flex() values on to RenderStyle
+        https://bugs.webkit.org/show_bug.cgi?id=64038
+
+        Reviewed by Eric Seidel.
+
+        No new tests, this just copies data to RenderStyle, which we can
+        then access when doing layout.  Tests will come with the layout
+        changes.
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::ApplyPropertyLength::applyValue):
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+
 2011-07-20  Daniel Bates  <dbates@rim.com>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -27 +27 @@
 
 #include "CSSCursorImageValue.h"
+#include "CSSFlexValue.h"
 #include "CSSPrimitiveValueMappings.h"
 #include "CSSStyleSelector.h"
@@ -214 +215 @@
 enum LengthNone {NoneDisabled = 0, NoneEnabled = 1};
 enum LengthUndefined {UndefinedDisabled = 0, UndefinedEnabled = 1};
+enum LengthFlexDirection {FlexDirectionDisabled = 0, FlexWidth = 1, FlexHeight};
 template <LengthAuto autoEnabled = AutoDisabled,
           LengthIntrinsic intrinsicEnabled = IntrinsicDisabled,
           LengthMinIntrinsic minIntrinsicEnabled = MinIntrinsicDisabled,
           LengthNone noneEnabled = NoneDisabled,
-          LengthUndefined noneUndefined = UndefinedDisabled>
+          LengthUndefined noneUndefined = UndefinedDisabled,
+          LengthFlexDirection flexDirection = FlexDirectionDisabled>
 class ApplyPropertyLength : public ApplyPropertyDefaultBase<Length> {
 public:
@@ -229 +232 @@
     virtual void applyValue(CSSStyleSelector* selector, CSSValue* value) const
     {
+#if ENABLE(CSS3_FLEXBOX)
+        if (!value->isPrimitiveValue()) {
+            if (!flexDirection || !value->isFlexValue())
+                return;
+
+            CSSFlexValue* flexValue = static_cast<CSSFlexValue*>(value);
+            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());
+            }
+        }
+#else
         if (!value->isPrimitiveValue())
             return;
+#endif
 
         CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(value);
@@ -750 +771 @@
     setPropertyHandler(CSSPropertyLeft, new ApplyPropertyLength<AutoEnabled>(&RenderStyle::left, &RenderStyle::setLeft, &RenderStyle::initialOffset));
 
-    setPropertyHandler(CSSPropertyWidth, new ApplyPropertyLength<AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled>(&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize));
-    setPropertyHandler(CSSPropertyHeight, new ApplyPropertyLength<AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled>(&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize));
+    setPropertyHandler(CSSPropertyWidth, new ApplyPropertyLength<AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled, FlexWidth>(&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize));
+    setPropertyHandler(CSSPropertyHeight, new ApplyPropertyLength<AutoEnabled, IntrinsicEnabled, MinIntrinsicEnabled, NoneDisabled, UndefinedDisabled, FlexHeight>(&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize));
 
     setPropertyHandler(CSSPropertyTextIndent, new ApplyPropertyLength<>(&RenderStyle::textIndent, &RenderStyle::setTextIndent, &RenderStyle::initialTextIndent));