Changeset 109311 in webkit

Timestamp:

Feb 29, 2012 10:22:39 PM (12 years ago)

Author:

macpherson@chromium.org

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleApplyProperty.cpp (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (2 diffs)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  Luke Macpherson   <macpherson@chromium.org>
+
+        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   <macpherson@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp

@@ -1785 +1785 @@
     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());

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -3646 +3646 @@
     case CSSPropertyWebkitColorCorrection:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(colorSpace, ColorSpace);
-        return;
-    case CSSPropertySpeak:
-        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(speak, Speak);
         return;
     case CSSPropertyInvalid:
@@ -3929 +3926 @@
     case CSSPropertyRight:
     case CSSPropertySize:
+    case CSSPropertySpeak:
     case CSSPropertyTableLayout:
     case CSSPropertyTextAlign:

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

@@ -962 +962 @@
     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)