Title: [109311] trunk/Source/WebCore
- Revision
- 109311
- Author
- [email protected]
- Date
- 2012-02-29 22:22:39 -0800 (Wed, 29 Feb 2012)
Log Message
Handle CSSPropertySpeak in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=79879
Reviewed by Eric Seidel.
No new tests / refactoring only.
* css/CSSStyleApplyProperty.cpp:
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::collectMatchingRulesForList):
* rendering/style/RenderStyle.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109310 => 109311)
--- trunk/Source/WebCore/ChangeLog 2012-03-01 06:12:22 UTC (rev 109310)
+++ trunk/Source/WebCore/ChangeLog 2012-03-01 06:22:39 UTC (rev 109311)
@@ -1,5 +1,20 @@
2012-02-29 Luke Macpherson <[email protected]>
+ Handle CSSPropertySpeak in CSSStyleApplyProperty.
+ https://bugs.webkit.org/show_bug.cgi?id=79879
+
+ Reviewed by Eric Seidel.
+
+ No new tests / refactoring only.
+
+ * css/CSSStyleApplyProperty.cpp:
+ (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::collectMatchingRulesForList):
+ * rendering/style/RenderStyle.h:
+
+2012-02-29 Luke Macpherson <[email protected]>
+
Handle CSSPropertyWebkitColumnAxis in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=79869
Modified: trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp (109310 => 109311)
--- trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 06:12:22 UTC (rev 109310)
+++ trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp 2012-03-01 06:22:39 UTC (rev 109311)
@@ -1784,6 +1784,7 @@
setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
setPropertyHandler(CSSPropertyRight, ApplyPropertyLength<&RenderStyle::right, &RenderStyle::setRight, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler());
+ setPropertyHandler(CSSPropertySpeak, ApplyPropertyDefault<ESpeak, &RenderStyle::speak, ESpeak, &RenderStyle::setSpeak, ESpeak, &RenderStyle::initialSpeak>::createHandler());
setPropertyHandler(CSSPropertyTableLayout, ApplyPropertyDefault<ETableLayout, &RenderStyle::tableLayout, ETableLayout, &RenderStyle::setTableLayout, ETableLayout, &RenderStyle::initialTableLayout>::createHandler());
setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler());
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (109310 => 109311)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 06:12:22 UTC (rev 109310)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-03-01 06:22:39 UTC (rev 109311)
@@ -3646,9 +3646,6 @@
case CSSPropertyWebkitColorCorrection:
HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(colorSpace, ColorSpace);
return;
- case CSSPropertySpeak:
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(speak, Speak);
- return;
case CSSPropertyInvalid:
return;
// Directional properties are resolved by resolveDirectionAwareProperty() before the switch.
@@ -3928,6 +3925,7 @@
case CSSPropertyResize:
case CSSPropertyRight:
case CSSPropertySize:
+ case CSSPropertySpeak:
case CSSPropertyTableLayout:
case CSSPropertyTextAlign:
case CSSPropertyTextDecoration:
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (109310 => 109311)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-01 06:12:22 UTC (rev 109310)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2012-03-01 06:22:39 UTC (rev 109311)
@@ -961,7 +961,7 @@
EImageRendering imageRendering() const { return static_cast<EImageRendering>(rareInheritedData->m_imageRendering); }
- ESpeak speak() { return static_cast<ESpeak>(rareInheritedData->speak); }
+ ESpeak speak() const { return static_cast<ESpeak>(rareInheritedData->speak); }
#if ENABLE(CSS_FILTERS)
FilterOperations& filter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
