Changeset 98748 in webkit

Timestamp:

Oct 28, 2011, 12:15:26 PM (15 years ago)

Author:

macpherson@chromium.org

Message:

Use enum instead of bool to represent -webkit-column-span property.
​https://bugs.webkit.org/show_bug.cgi?id=70867

Reviewed by Darin Adler.

Covered by existing tests.

• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator ColumnSpan):

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::createAnonymousColumnSpanBlock):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::propagateStyleToAnonymousChildren):

• rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::columnSpan):
(WebCore::InheritedFlags::setColumnSpan):
(WebCore::InheritedFlags::initialColumnSpan):

• rendering/style/RenderStyleConstants.h:
• rendering/style/StyleMultiColData.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValueMappings.h (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (3 diffs)
• rendering/style/RenderStyleConstants.h (modified) (1 diff)
• rendering/style/StyleMultiColData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Luke Macpherson   <macpherson@chromium.org>
+
+        Use enum instead of bool to represent -webkit-column-span property.
+        https://bugs.webkit.org/show_bug.cgi?id=70867
+
+        Reviewed by Darin Adler.
+
+        Covered by existing tests.
+
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator ColumnSpan):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::createAnonymousColumnSpanBlock):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::propagateStyleToAnonymousChildren):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::columnSpan):
+        (WebCore::InheritedFlags::setColumnSpan):
+        (WebCore::InheritedFlags::initialColumnSpan):
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/StyleMultiColData.h:
+
 2011-10-28  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

@@ -131 +131 @@
 }
 
+template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan)
+    : m_hasCachedCSSText(false)
+{
+    switch (columnSpan) {
+    case ColumnSpanAll:
+        m_type = CSS_IDENT;
+        m_value.ident = CSSValueAll;
+        break;
+    case ColumnSpanOne:
+        m_type = CSS_NUMBER;
+        m_value.num = 1;
+        break;
+    }
+}
+
+template<> inline CSSPrimitiveValue::operator ColumnSpan() const
+{
+    if (m_type == CSS_IDENT && m_value.ident == CSSValueAll)
+        return ColumnSpanAll;
+    if (m_type == CSS_NUMBER && m_value.num == 1)
+        return ColumnSpanOne;
+    ASSERT_NOT_REACHED();
+    return ColumnSpanOne;
+}
+
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBorderStyle e)
     : m_type(CSS_IDENT)

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -2478 +2478 @@
     bool isInitial = valueType == CSSValue::CSS_INITIAL || (!m_parentNode && valueType == CSSValue::CSS_INHERIT);
 
+    ASSERT(!isInherit || !isInitial); // isInherit -> !isInitial && isInitial -> !isInherit
+
     if (!applyPropertyToRegularStyle() && (!applyPropertyToVisitedLinkStyle() || !isValidVisitedLinkProperty(id))) {
         // Limit the properties that can be applied to only the ones honored by :visited.
@@ -3357 +3359 @@
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(boxSizing, BoxSizing);
         return;
-    case CSSPropertyWebkitColumnSpan: {
-        HANDLE_INHERIT_AND_INITIAL(columnSpan, ColumnSpan)
-        m_style->setColumnSpan(primitiveValue->getIdent() == CSSValueAll);
-        return;
-    }
+    case CSSPropertyWebkitColumnSpan:
+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(columnSpan, ColumnSpan)
+        return;
     case CSSPropertyWebkitColumnRuleStyle:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(columnRuleStyle, ColumnRuleStyle, BorderStyle)

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6223 +6223 @@
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style());
-    newStyle->setColumnSpan(true);
+    newStyle->setColumnSpan(ColumnSpanAll);
     newStyle->setDisplay(BLOCK);
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1907 +1907 @@
                 newStyle->inheritColumnPropertiesFrom(style());
             if (child->style()->columnSpan())
-                newStyle->setColumnSpan(true);
+                newStyle->setColumnSpan(ColumnSpanAll);
         }
         newStyle->setDisplay(child->style()->display());

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

@@ -774 +774 @@
     unsigned short columnRuleWidth() const { return rareNonInheritedData->m_multiCol->ruleWidth(); }
     bool columnRuleIsTransparent() const { return rareNonInheritedData->m_multiCol->m_rule.isTransparent(); }
-    bool columnSpan() const { return rareNonInheritedData->m_multiCol->m_columnSpan; }
+    ColumnSpan columnSpan() const { return static_cast<ColumnSpan>(rareNonInheritedData->m_multiCol->m_columnSpan); }
     EPageBreak columnBreakBefore() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakBefore); }
     EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakInside); }
@@ -1165 +1165 @@
     void setColumnRuleWidth(unsigned short w) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule.m_width, w); }
     void resetColumnRule() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_rule, BorderValue()) }
-    void setColumnSpan(bool b) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_columnSpan, b); }
+    void setColumnSpan(ColumnSpan columnSpan) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_columnSpan, columnSpan); }
     void setColumnBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakBefore, p); }
     // For valid values of column-break-inside see http://www.w3.org/TR/css3-multicol/#break-before-break-after-break-inside
@@ -1452 +1452 @@
     static float initialTextStrokeWidth() { return 0; }
     static unsigned short initialColumnCount() { return 1; }
-    static bool initialColumnSpan() { return false; }
+    static ColumnSpan initialColumnSpan() { return ColumnSpanOne; }
     static const TransformOperations& initialTransform() { DEFINE_STATIC_LOCAL(TransformOperations, ops, ()); return ops; }
     static Length initialTransformOriginX() { return Length(50.0, Percent); }

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

@@ -83 +83 @@
     PUBLIC_PSEUDOID_MASK = ((1 << FIRST_INTERNAL_PSEUDOID) - 1) & ~((1 << FIRST_PUBLIC_PSEUDOID) - 1)
 };
+
+enum ColumnSpan { ColumnSpanOne = 0, ColumnSpanAll};
 
 enum EBorderCollapse { BSEPARATE = 0, BCOLLAPSE = 1 };

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

@@ -63 +63 @@
     bool m_autoCount : 1;
     bool m_normalGap : 1;
-    bool m_columnSpan : 1;
+    unsigned m_columnSpan : 1;
     unsigned m_breakBefore : 2; // EPageBreak
     unsigned m_breakAfter : 2; // EPageBreak