Changeset 94037 in webkit

Timestamp:

Aug 29, 2011, 6:49:10 PM (15 years ago)

Author:

macpherson@chromium.org

Message:

Implement CSSPropertyWebkitColumns in CSSStyleApplyProperty.
​https://bugs.webkit.org/show_bug.cgi?id=67106

Reviewed by Darin Adler.

Tests:
LayoutTests/fast/multicol/inherit-column-values.html
LayoutTests/fast/multicol/initial-column-values.html

• css/CSSStyleApplyProperty.cpp:

(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
Initialize handler for CSSPropertyWebkitColumns.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
Remove existing implementation for CSSPropertyWebkitColumns.

Location:

trunk

Files:

• LayoutTests/fast/multicol/inherit-column-values-expected.txt (added)
• LayoutTests/fast/multicol/inherit-column-values.html (added)
• LayoutTests/fast/multicol/initial-column-values-expected.txt (added)
• LayoutTests/fast/multicol/initial-column-values.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleApplyProperty.cpp (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Luke Macpherson   <macpherson@chromium.org>
+
+        Implement CSSPropertyWebkitColumns in CSSStyleApplyProperty.
+        https://bugs.webkit.org/show_bug.cgi?id=67106
+
+        Reviewed by Darin Adler.
+
+        Tests:
+        LayoutTests/fast/multicol/inherit-column-values.html
+        LayoutTests/fast/multicol/initial-column-values.html
+
+        * css/CSSStyleApplyProperty.cpp:
+        (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+        Initialize handler for CSSPropertyWebkitColumns.
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Remove existing implementation for CSSPropertyWebkitColumns.
+
 2011-08-29  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -1070 +1070 @@
     setPropertyHandler(CSSPropertyWebkitColumnGap, new ApplyPropertyAuto<float, ComputeLength, CSSValueNormal>(&RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap));
     setPropertyHandler(CSSPropertyWebkitColumnWidth, new ApplyPropertyAuto<float, ComputeLength>(&RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth));
+    setPropertyHandler(CSSPropertyWebkitColumns, new ApplyPropertyExpanding<SuppressValue>(propertyHandler(CSSPropertyWebkitColumnWidth), propertyHandler(CSSPropertyWebkitColumnCount)));
 
     setPropertyHandler(CSSPropertyWebkitHighlight, new ApplyPropertyString<MapNoneToNull>(&RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight));

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4444 +4444 @@
         else if (isInitial)
             m_style->resetColumnRule();
-        return;
-    case CSSPropertyWebkitColumns:
-        if (isInherit) {
-            if (m_parentStyle->hasAutoColumnWidth())
-                m_style->setHasAutoColumnWidth();
-            else
-                m_style->setColumnWidth(m_parentStyle->columnWidth());
-            m_style->setColumnCount(m_parentStyle->columnCount());
-        } else if (isInitial) {
-            m_style->setHasAutoColumnWidth();
-            m_style->setColumnCount(RenderStyle::initialColumnCount());
-        }
         return;
     case CSSPropertyWebkitRegionBreakBefore:
@@ -5051 +5039 @@
     case CSSPropertyWebkitTransitionTimingFunction:
     case CSSPropertyCursor:
+    case CSSPropertyWebkitColumns:
     case CSSPropertyWebkitColumnCount:
     case CSSPropertyWebkitColumnGap: