Make CSSValuePool thread local to ensure correct parsing in colors on workers

third_party/WebKit/Source/modules/canvas2d/CanvasStyle.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 22 matching lines @@
 #include "core/css/parser/CSSParser.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, ParseFailed };
 
-static ColorParseResult parseColor(Color& parsedColor, const String& colorString)
+static ColorParseResult parseColor(Color& parsedColor, const String& colorString, CSSValuePool* localCssValuePool)
 {
     if (equalIgnoringCase(colorString, "currentcolor"))
         return ParsedCurrentColor;
     const bool useStrictParsing = true;
-    if (CSSParser::parseColor(parsedColor, colorString, useStrictParsing))
+    if (CSSParser::parseColor(parsedColor, colorString, localCssValuePool, useStrictParsing))
         return ParsedRGBA;
     if (CSSParser::parseSystemColor(parsedColor, colorString))
         return ParsedSystemColor;
     return ParseFailed;
 }
 
-static Color currentColor(HTMLCanvasElement* canvas)
+static Color currentColor(HTMLCanvasElement* canvas, CSSValuePool* localCssValuePool)
 {
-    if (!canvas || !canvas->inDocument() || !canvas->inlineStyle())
+    if (!localCssValuePool && (!canvas || !canvas->inDocument() || !canvas->inlineStyle()))
         return Color::black;
     Color color = Color::black;
-    CSSParser::parseColor(color, canvas->inlineStyle()->getPropertyValue(CSSPropertyColor));
+    CSSParser::parseColor(color, canvas->inlineStyle()->getPropertyValue(CSSPropertyColor), localCssValuePool);
     return color;
 }
 
-bool parseColorOrCurrentColor(Color& parsedColor, const String& colorString, HTMLCanvasElement* canvas)
+bool parseColorOrCurrentColor(Color& parsedColor, const String& colorString, HTMLCanvasElement* canvas, CSSValuePool* localCssValuePool)
 {
-    ColorParseResult parseResult = parseColor(parsedColor, colorString);
+    ColorParseResult parseResult = parseColor(parsedColor, colorString, localCssValuePool);
     switch (parseResult) {
     case ParsedRGBA:
     case ParsedSystemColor:
         return true;
     case ParsedCurrentColor:
-        parsedColor = canvas ? currentColor(canvas) : Color::black;
+        parsedColor = currentColor(canvas, localCssValuePool);
         return true;
     case ParseFailed:
         return false;
     default:
         ASSERT_NOT_REACHED();
         return false;
     }
 }
 
 CanvasStyle::CanvasStyle(RGBA32 rgba)
@@ skipping 51 matching lines @@
     return Color::black;
 }
 
 DEFINE_TRACE(CanvasStyle)
 {
     visitor->trace(m_gradient);
     visitor->trace(m_pattern);
 }
 
 } // namespace blink