Recognise variable names when parsing CSS property names

third_party/WebKit/Source/modules/csspaint/PaintWorkletGlobalScope.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/PaintWorkletGlobalScope.h"
 
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/CSSPropertyNames.h"
-#include "core/css/parser/CSSVariableParser.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "modules/csspaint/CSSPaintDefinition.h"
 #include "modules/csspaint/CSSPaintImageGeneratorImpl.h"
 
 namespace blink {
 
 // static
 PaintWorkletGlobalScope* PaintWorkletGlobalScope::create(LocalFrame* frame, const KURL& url, const String& userAgent, PassRefPtr<SecurityOrigin> securityOrigin, v8::Isolate* isolate)
 {
@@ skipping 47 matching lines @@
     Vector<AtomicString> customInvalidationProperties;
 
     if (!isUndefinedOrNull(inputPropertiesValue)) {
         Vector<String> properties = toImplArray<Vector<String>>(inputPropertiesValue, 0, isolate, exceptionState);
 
         if (exceptionState.hadException())
             return;
 
         for (const auto& property : properties) {
             CSSPropertyID propertyID = cssPropertyID(property);
-            if (propertyID == CSSPropertyInvalid) {
-                if (CSSVariableParser::isValidVariableName(property))
-                    customInvalidationProperties.append(property);
-            } else {
+            if (propertyID == CSSPropertyVariable) {
+                customInvalidationProperties.append(property);
+            } else if (propertyID != CSSPropertyInvalid) {
                 nativeInvalidationProperties.append(propertyID);
             }
         }
     }
 
     // Parse 'alpha' AKA hasAlpha property.
     v8::Local<v8::Value> alphaValue;
     if (!v8Call(constructor->Get(context, v8String(isolate, "alpha")), alphaValue))
         return;
     if (!isUndefinedOrNull(alphaValue) && !alphaValue->IsBoolean()) {
@@ skipping 63 matching lines @@
 }
 
 DEFINE_TRACE(PaintWorkletGlobalScope)
 {
     visitor->trace(m_paintDefinitions);
     visitor->trace(m_pendingGenerators);
     MainThreadWorkletGlobalScope::trace(visitor);
 }
 
 } // namespace blink