Implement CSSPaintValue and add a layout test.

third_party/WebKit/Source/modules/csspaint/CSSPaintDefinition.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/csspaint/CSSPaintDefinition.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "core/css/CSSComputedStyleDeclaration.h"
+#include "core/css/CSSVariableData.h"
 #include "core/css/cssom/FilteredComputedStylePropertyMap.h"
+#include "core/css/cssom/StyleValueFactory.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/layout/LayoutObject.h"
 #include "modules/csspaint/PaintRenderingContext2D.h"
 #include "modules/csspaint/PaintSize.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/PaintGeneratedImage.h"
 #include "platform/graphics/RecordingImageBufferSurface.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
@@ skipping 36 matching lines @@
       m_paint(scriptState->isolate(), paint),
       m_didCallConstructor(false),
       m_hasAlpha(hasAlpha) {
   m_nativeInvalidationProperties.swap(nativeInvalidationProperties);
   m_customInvalidationProperties.swap(customInvalidationProperties);
   m_inputArgumentTypes.swap(inputArgumentTypes);
 }
 
 CSSPaintDefinition::~CSSPaintDefinition() {}
 
-PassRefPtr<Image> CSSPaintDefinition::paint(const LayoutObject& layoutObject,
-                                            const IntSize& size,
-                                            float zoom) {
+PassRefPtr<Image> CSSPaintDefinition::paint(
+    const LayoutObject& layoutObject,
+    const IntSize& size,
+    float zoom,
+    const Vector<RefPtr<CSSVariableData>>& variableData) {
   const IntSize specifiedSize = getSpecifiedSize(size, zoom);
 
   ScriptState::Scope scope(m_scriptState.get());
 
   maybeCreatePaintInstance();
 
   v8::Isolate* isolate = m_scriptState->isolate();
   v8::Local<v8::Object> instance = m_instance.newLocal(isolate);
 
   // We may have failed to create an instance class, in which case produce an
   // invalid image.
   if (isUndefinedOrNull(instance))
     return nullptr;
 
   DCHECK(layoutObject.node());
 
   PaintRenderingContext2D* renderingContext = PaintRenderingContext2D::create(
       ImageBuffer::create(WTF::wrapUnique(
           new RecordingImageBufferSurface(size, nullptr /* fallbackFactory */,
                                           m_hasAlpha ? NonOpaque : Opaque))),
       m_hasAlpha, zoom);
   PaintSize* paintSize = PaintSize::create(specifiedSize);
   StylePropertyMap* styleMap = FilteredComputedStylePropertyMap::create(
       CSSComputedStyleDeclaration::create(layoutObject.node()),
       m_nativeInvalidationProperties, m_customInvalidationProperties,
       layoutObject.node());
 
+  // Parse arguments.
+  CSSStyleValueVector paintArguments;
+  if (RuntimeEnabledFeatures::cssPaintAPIArgumentsEnabled()) {
+    if (variableData.size() != m_inputArgumentTypes.size()) {
+      return nullptr;
+    }
+    for (size_t i = 0; i < variableData.size(); ++i) {
+      const CSSValue* parsedValue =
+          variableData[i].get()->parseForSyntax(m_inputArgumentTypes[i]);

[ikilpatrick, 2017/02/16 03:19:36]

this feels too late to parse the data? I think you should be able to do this
once inside CSSPaintValue? (instead on every invocation?)

[renjieliu1, 2017/02/16 04:11:14]

good suggestion! however parse the CSSVariableData needs input argument types,
do you think we can get it in CSSPaintValue?

+      if (!parsedValue)
+        return nullptr;
+      paintArguments.appendVector(
+          StyleValueFactory::cssValueToStyleValueVector(*parsedValue));
+    }
+  }
   v8::Local<v8::Value> argv[] = {
       ToV8(renderingContext, m_scriptState->context()->Global(), isolate),
       ToV8(paintSize, m_scriptState->context()->Global(), isolate),
-      ToV8(styleMap, m_scriptState->context()->Global(), isolate)};
+      ToV8(styleMap, m_scriptState->context()->Global(), isolate),
+      ToV8(paintArguments, m_scriptState->context()->Global(), isolate)};
 
   v8::Local<v8::Function> paint = m_paint.newLocal(isolate);
 
   v8::TryCatch block(isolate);
   block.SetVerbose(true);
 
   V8ScriptRunner::callFunction(paint, m_scriptState->getExecutionContext(),
-                               instance, 3, argv, isolate);
+                               instance, 4, argv, isolate);
 
   // The paint function may have produced an error, in which case produce an
   // invalid image.
   if (block.HasCaught()) {
     return nullptr;
   }
 
   return PaintGeneratedImage::create(
       renderingContext->imageBuffer()->getRecord(), specifiedSize);
 }
@@ skipping 11 matching lines @@
   v8::Local<v8::Object> paintInstance;
   if (V8ObjectConstructor::newInstance(isolate, constructor)
           .ToLocal(&paintInstance)) {
     m_instance.set(isolate, paintInstance);
   }
 
   m_didCallConstructor = true;
 }
 
 }  // namespace blink