| Index: Source/core/html/canvas/CanvasStyle.cpp
|
| diff --git a/Source/core/html/canvas/CanvasStyle.cpp b/Source/core/html/canvas/CanvasStyle.cpp
|
| index d7229866347b074b2821dd5af7fbe248cd5c9d33..2ff49c9af30dd51a9b53b48caafbc1e643dacb8f 100644
|
| --- a/Source/core/html/canvas/CanvasStyle.cpp
|
| +++ b/Source/core/html/canvas/CanvasStyle.cpp
|
| @@ -30,7 +30,7 @@
|
| #include "core/html/canvas/CanvasStyle.h"
|
|
|
| #include "CSSPropertyNames.h"
|
| -#include "core/css/parser/BisonCSSParser.h"
|
| +#include "core/css/parser/CSSParser.h"
|
| #include "core/css/StylePropertySet.h"
|
| #include "core/html/HTMLCanvasElement.h"
|
| #include "core/html/canvas/CanvasGradient.h"
|
| @@ -46,9 +46,9 @@ static ColorParseResult parseColor(RGBA32& parsedColor, const String& colorStrin
|
| {
|
| if (equalIgnoringCase(colorString, "currentcolor"))
|
| return ParsedCurrentColor;
|
| - if (BisonCSSParser::parseColor(parsedColor, colorString))
|
| + if (CSSParser::parseColor(parsedColor, colorString))
|
| return ParsedRGBA;
|
| - if (BisonCSSParser::parseSystemColor(parsedColor, colorString, document))
|
| + if (CSSParser::parseSystemColor(parsedColor, colorString, document))
|
| return ParsedSystemColor;
|
| return ParseFailed;
|
| }
|
| @@ -58,7 +58,7 @@ RGBA32 currentColor(HTMLCanvasElement* canvas)
|
| if (!canvas || !canvas->inDocument() || !canvas->inlineStyle())
|
| return Color::black;
|
| RGBA32 rgba = Color::black;
|
| - BisonCSSParser::parseColor(rgba, canvas->inlineStyle()->getPropertyValue(CSSPropertyColor));
|
| + CSSParser::parseColor(rgba, canvas->inlineStyle()->getPropertyValue(CSSPropertyColor));
|
| return rgba;
|
| }
|
|
|
|
|