Modified: trunk/Source/WebCore/ChangeLog (109524 => 109525)
--- trunk/Source/WebCore/ChangeLog 2012-03-02 08:33:36 UTC (rev 109524)
+++ trunk/Source/WebCore/ChangeLog 2012-03-02 08:50:08 UTC (rev 109525)
@@ -1,3 +1,17 @@
+2012-03-02 Luke Macpherson <macpher...@chromium.org>
+
+ Handle CSSPropertyWebkitColorCorrection in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=80056
+
+ Reviewed by Eric Seidel.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+
2012-03-02 John Bauman <jbau...@chromium.org>
[chromium] Send didCommitAndDrawFrame after swap
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (109524 => 109525)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-02 08:33:36 UTC (rev 109524)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-02 08:50:08 UTC (rev 109525)
@@ -1825,6 +1825,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(CSSPropertyWebkitColorCorrection, ApplyPropertyDefault<ColorSpace, &RenderStyle::colorSpace, ColorSpace, &RenderStyle::setColorSpace, ColorSpace, &RenderStyle::initialColorSpace>::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());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109524 => 109525)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-02 08:33:36 UTC (rev 109524)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-02 08:50:08 UTC (rev 109525)
@@ -3644,9 +3644,6 @@
return;
}
#endif
- case CSSPropertyWebkitColorCorrection:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(colorSpace, ColorSpace);
- return;
case CSSPropertyInvalid:
return;
// Directional properties are resolved by resolveDirectionAwareProperty() before the switch.
@@ -3967,6 +3964,7 @@
case CSSPropertyWebkitBoxOrdinalGroup:
case CSSPropertyWebkitBoxOrient:
case CSSPropertyWebkitBoxPack:
+ case CSSPropertyWebkitColorCorrection:
case CSSPropertyWebkitColumnAxis:
case CSSPropertyWebkitColumnCount:
case CSSPropertyWebkitColumnGap:
