Changeset 59473 in webkit

Timestamp:

May 14, 2010 7:47:12 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-14 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string.
​https://bugs.webkit.org/show_bug.cgi?id=39031

• css/CSSParser.cpp: (WebCore::CSSParser::parseColor):
• editing/ApplyStyleCommand.cpp: (WebCore::StyleChange::extractTextStyles): Don't depend on old behavior.
• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::setShadow): Remove dead code.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• editing/ApplyStyleCommand.cpp (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-14  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string.
+        https://bugs.webkit.org/show_bug.cgi?id=39031
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseColor):
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::StyleChange::extractTextStyles): Don't depend on old behavior.
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setShadow): Remove dead code.
+
 2010-05-14  Jens Alfke  <snej@chromium.org>
 

trunk/WebCore/css/CSSParser.cpp

@@ -285 +285 @@
 bool CSSParser::parseColor(RGBA32& color, const String& string, bool strict)
 {
-    color = 0;
     CSSParser parser(true);
 

trunk/WebCore/editing/ApplyStyleCommand.cpp

@@ -213 +213 @@
         ASSERT(colorValue->isPrimitiveValue());
         CSSPrimitiveValue* primitiveColor = static_cast<CSSPrimitiveValue*>(colorValue.get());
-        RGBA32 rgba;
+        RGBA32 rgba = 0;
         if (primitiveColor->primitiveType() != CSSPrimitiveValue::CSS_RGBCOLOR) {
             CSSParser::parseColor(rgba, colorValue->cssText());

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -882 +882 @@
 
     RGBA32 rgba = makeRGBA32FromFloats(r, g, b, a); // default is transparent black
-    if (!state().m_shadowColor.isEmpty())
-        CSSParser::parseColor(rgba, state().m_shadowColor);
     c->setShadow(IntSize(width, -height), state().m_shadowBlur, Color(rgba), DeviceColorSpace);
 }