Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/CSSPaintValue.cpp | 
| diff --git a/third_party/WebKit/Source/core/css/CSSPaintValue.cpp b/third_party/WebKit/Source/core/css/CSSPaintValue.cpp | 
| index d93ed2427d3ac01d91fb5ad2df69035ae8745ae8..354c1883f9c4013c56174b2736004977c3d0ea82 100644 | 
| --- a/third_party/WebKit/Source/core/css/CSSPaintValue.cpp | 
| +++ b/third_party/WebKit/Source/core/css/CSSPaintValue.cpp | 
| @@ -5,6 +5,8 @@ | 
| #include "core/css/CSSPaintValue.h" | 
| #include "core/css/CSSCustomIdentValue.h" | 
| +#include "core/css/CSSSyntaxDescriptor.h" | 
| +#include "core/css/cssom/StyleValueFactory.h" | 
| #include "core/layout/LayoutObject.h" | 
| #include "platform/graphics/Image.h" | 
| #include "wtf/text/StringBuilder.h" | 
| @@ -47,7 +49,39 @@ PassRefPtr<Image> CSSPaintValue::image(const LayoutObject& layoutObject, | 
| m_generator = CSSPaintImageGenerator::create( | 
| name(), layoutObject.document(), m_paintImageGeneratorObserver); | 
| - return m_generator->paint(layoutObject, size, zoom); | 
| + if (m_inputArgumentsInValid) | 
| + return nullptr; | 
| + | 
| + if (!m_parsedInputArguments) { | 
| + // Parse arguments. | 
| 
 
ikilpatrick
2017/02/27 17:25:02
Could you extract this into a private function, an
 
renjieliu1
2017/02/27 23:20:43
thanks for the suggestion
 
 | 
| + if (RuntimeEnabledFeatures::cssPaintAPIArgumentsEnabled()) { | 
| + if (!m_generator->isImageGeneratorReady()) { | 
| + return nullptr; | 
| + } | 
| + const Vector<CSSSyntaxDescriptor>& inputArgumentTypes = | 
| + m_generator->inputArgumentTypes(); | 
| + if (m_argumentVariableData.size() != inputArgumentTypes.size()) { | 
| + m_inputArgumentsInValid = true; | 
| + return nullptr; | 
| + } | 
| + | 
| + m_parsedInputArguments = new CSSStyleValueVector(); | 
| + | 
| + for (size_t i = 0; i < m_argumentVariableData.size(); ++i) { | 
| + const CSSValue* parsedValue = | 
| + m_argumentVariableData[i]->parseForSyntax(inputArgumentTypes[i]); | 
| + if (!parsedValue) { | 
| + m_inputArgumentsInValid = true; | 
| + m_parsedInputArguments = nullptr; | 
| + return nullptr; | 
| + } | 
| + m_parsedInputArguments->appendVector( | 
| + StyleValueFactory::cssValueToStyleValueVector(*parsedValue)); | 
| + } | 
| + } | 
| + } | 
| + | 
| + return m_generator->paint(layoutObject, size, zoom, m_parsedInputArguments); | 
| } | 
| void CSSPaintValue::Observer::paintImageGeneratorReady() { | 
| @@ -73,6 +107,7 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSPaintValue) { | 
| visitor->trace(m_name); | 
| visitor->trace(m_generator); | 
| visitor->trace(m_paintImageGeneratorObserver); | 
| + visitor->trace(m_parsedInputArguments); | 
| CSSImageGeneratorValue::traceAfterDispatch(visitor); | 
| } |