Changeset 85938 in webkit

Timestamp:

May 6, 2011 1:42:10 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-06 Luke Macpherson <​macpherson@chromium.org>

Reviewed by Eric Seidel.

Make CSSStyleSelector::applyProperty() CSSPropertyWebkitColorCorrection case use appropriate macro.
​https://bugs.webkit.org/show_bug.cgi?id=60339

No tests added as no functionality changed.

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty): Use correct macro for CSSPropertySpeak.
• rendering/style/RenderStyle.h: (WebCore::InheritedFlags::initialColorSpace): Add initialColorSpace() static method.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  Luke Macpherson   <macpherson@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Make CSSStyleSelector::applyProperty() CSSPropertyWebkitColorCorrection case use appropriate macro.
+        https://bugs.webkit.org/show_bug.cgi?id=60339
+
+        No tests added as no functionality changed.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Use correct macro for CSSPropertySpeak.
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::initialColorSpace):
+        Add initialColorSpace() static method.
+
 2011-05-06  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -5398 +5398 @@
     }
     case CSSPropertyWebkitColorCorrection:
-        if (isInherit) 
-            m_style->setColorSpace(m_parentStyle->colorSpace());
-        else if (isInitial)
-            m_style->setColorSpace(ColorSpaceDeviceRGB);
-        else {
-            if (!primitiveValue)
-                return;
-            m_style->setColorSpace(*primitiveValue);
-        }
+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(colorSpace, ColorSpace);
         return;
     case CSSPropertySize:

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

@@ -1218 +1218 @@
     static ECaptionSide initialCaptionSide() { return CAPTOP; }
     static EClear initialClear() { return CNONE; }
+    static ColorSpace initialColorSpace() { return ColorSpaceDeviceRGB; }
     static TextDirection initialDirection() { return LTR; }
     static WritingMode initialWritingMode() { return TopToBottomWritingMode; }