Changeset 86040 in webkit

Timestamp:

May 8, 2011 7:16:39 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Eric Seidel.

Make RenderStyle::setColumnBreakInside() reject unsupported enum values.
​https://bugs.webkit.org/show_bug.cgi?id=60249

No new tests added as no functionality changed.

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Remove special-case code and use appropriate macro.
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::setColumnBreakInside): Assert that supported 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-08  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Make RenderStyle::setColumnBreakInside() reject unsupported enum values.
+        https://bugs.webkit.org/show_bug.cgi?id=60249
+
+        No new tests added as no functionality changed.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove special-case code and use appropriate macro.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::setColumnBreakInside):
+        Assert that supported values are used.
+
 2011-05-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4980 +4980 @@
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(columnBreakAfter, ColumnBreakAfter, PageBreak)
         return;
-    case CSSPropertyWebkitColumnBreakInside: {
-        HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(columnBreakInside, ColumnBreakInside, PageBreak)
-        EPageBreak pb = *primitiveValue;
-        if (pb != PBALWAYS)
-            m_style->setColumnBreakInside(pb);
-        return;
-    }
+    case CSSPropertyWebkitColumnBreakInside:
+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(columnBreakInside, ColumnBreakInside, PageBreak)
+        return;
      case CSSPropertyWebkitColumnRule:
         if (isInherit) {

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

@@ -1076 +1076 @@
     void setColumnSpan(bool b) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_columnSpan, b); }
     void setColumnBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakBefore, p); }
-    void setColumnBreakInside(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); }
+    // For valid values of column-break-inside see http://www.w3.org/TR/css3-multicol/#break-before-break-after-break-inside
+    void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); }
     void setColumnBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakAfter, p); }
     void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData.access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }