Modified: trunk/Source/WebCore/ChangeLog (109309 => 109310)
--- trunk/Source/WebCore/ChangeLog 2012-03-01 05:57:05 UTC (rev 109309)
+++ trunk/Source/WebCore/ChangeLog 2012-03-01 06:12:22 UTC (rev 109310)
@@ -1,3 +1,17 @@
+2012-02-29 Luke Macpherson <macpher...@chromium.org>
+
+ Handle CSSPropertyWebkitColumnAxis in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=79869
+
+ Reviewed by Eric Seidel.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-02-29 Erik Arvidsson <a...@chromium.org>
Rename DOMSelection to Selection
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (109309 => 109310)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 05:57:05 UTC (rev 109309)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 06:12:22 UTC (rev 109310)
@@ -1821,6 +1821,7 @@
setPropertyHandler(CSSPropertyWebkitBoxOrdinalGroup, ApplyPropertyDefault<unsigned int, &RenderStyle::boxOrdinalGroup, unsigned int, &RenderStyle::setBoxOrdinalGroup, unsigned int, &RenderStyle::initialBoxOrdinalGroup>::createHandler());
setPropertyHandler(CSSPropertyWebkitBoxOrient, ApplyPropertyDefault<EBoxOrient, &RenderStyle::boxOrient, EBoxOrient, &RenderStyle::setBoxOrient, EBoxOrient, &RenderStyle::initialBoxOrient>::createHandler());
setPropertyHandler(CSSPropertyWebkitBoxPack, ApplyPropertyDefault<EBoxPack, &RenderStyle::boxPack, EBoxPack, &RenderStyle::setBoxPack, EBoxPack, &RenderStyle::initialBoxPack>::createHandler());
+ setPropertyHandler(CSSPropertyWebkitColumnAxis, ApplyPropertyDefault<ColumnAxis, &RenderStyle::columnAxis, ColumnAxis, &RenderStyle::setColumnAxis, ColumnAxis, &RenderStyle::initialColumnAxis>::createHandler());
setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109309 => 109310)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 05:57:05 UTC (rev 109309)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 06:12:22 UTC (rev 109310)
@@ -3741,10 +3741,6 @@
return;
}
- case CSSPropertyWebkitColumnAxis:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(columnAxis, ColumnAxis);
- return;
-
case CSSPropertyWebkitWrapShapeInside:
HANDLE_INHERIT_AND_INITIAL(wrapShapeInside, WrapShapeInside);
if (!primitiveValue)
@@ -3969,6 +3965,7 @@
case CSSPropertyWebkitBoxOrdinalGroup:
case CSSPropertyWebkitBoxOrient:
case CSSPropertyWebkitBoxPack:
+ case CSSPropertyWebkitColumnAxis:
case CSSPropertyWebkitColumnCount:
case CSSPropertyWebkitColumnGap:
case CSSPropertyWebkitColumnRuleColor:
