Changeset 85935 in webkit

Timestamp:

May 6, 2011 1:17:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-06 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Eric Seidel.

Move burden of checking for BJustify box alignment into RenderStyle
​https://bugs.webkit.org/show_bug.cgi?id=60246

No new tests added as no functionality changed.

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Remove special-case logic checking for BJUSTIFY and use existing macro.
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::setBoxAlign): Assert valid values are used.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Move burden of checking for BJustify box alignment into RenderStyle
+        https://bugs.webkit.org/show_bug.cgi?id=60246
+
+        No new tests added as no functionality changed.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove special-case logic checking for BJUSTIFY and use existing macro.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::setBoxAlign):
+        Assert valid values are used.
+
 2011-05-06  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4874 +4874 @@
         return;
     case CSSPropertyWebkitBoxAlign:
-    {
-        HANDLE_INHERIT_AND_INITIAL(boxAlign, BoxAlign)
-        if (!primitiveValue)
-            return;
-        EBoxAlignment boxAlignment = *primitiveValue;
-        if (boxAlignment != BJUSTIFY)
-            m_style->setBoxAlign(boxAlignment);
-        return;
-    }
+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(boxAlign, BoxAlign)
+        return;
     case CSSPropertySrc: // Only used in @font-face rules.
         return;

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1027 +1027 @@
     void setOpacity(float f) { SET_VAR(rareNonInheritedData, opacity, f); }
     void setAppearance(ControlPart a) { SET_VAR(rareNonInheritedData, m_appearance, a); }
-    void setBoxAlign(EBoxAlignment a) { SET_VAR(rareNonInheritedData.access()->flexibleBox, align, a); }
+    // For valid values of box-align see http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#alignment
+    void setBoxAlign(EBoxAlignment a) { ASSERT(a == BSTRETCH || a == BSTART || a == BCENTER || a == BEND || a == BBASELINE); SET_VAR(rareNonInheritedData.access()->flexibleBox, align, a); }
     void setBoxDirection(EBoxDirection d) { inherited_flags._box_direction = d; }
     void setBoxFlex(float f) { SET_VAR(rareNonInheritedData.access()->flexibleBox, flex, f); }