Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp

Issue 2288633002: Recognise variable names when parsing CSS property names (Closed)
Patch Set: fix long var names Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/cssom/CSSStyleValue.h" 5 #include "core/css/cssom/CSSStyleValue.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptValue.h" 8 #include "bindings/core/v8/ScriptValue.h"
9 #include "bindings/core/v8/ToV8.h" 9 #include "bindings/core/v8/ToV8.h"
10 #include "core/StylePropertyShorthand.h" 10 #include "core/StylePropertyShorthand.h"
11 #include "core/css/cssom/StyleValueFactory.h" 11 #include "core/css/cssom/StyleValueFactory.h"
12 #include "core/css/parser/CSSParser.h" 12 #include "core/css/parser/CSSParser.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 ScriptValue CSSStyleValue::parse(ScriptState* scriptState, const String& propert yName, const String& value, ExceptionState& exceptionState) 16 ScriptValue CSSStyleValue::parse(ScriptState* scriptState, const String& propert yName, const String& value, ExceptionState& exceptionState)
17 { 17 {
18 if (propertyName.isEmpty()) { 18 if (propertyName.isEmpty()) {
19 exceptionState.throwTypeError("Property name cannot be empty"); 19 exceptionState.throwTypeError("Property name cannot be empty");
20 return ScriptValue::createNull(scriptState); 20 return ScriptValue::createNull(scriptState);
21 } 21 }
22 22
23 CSSPropertyID propertyID = cssPropertyID(propertyName); 23 CSSPropertyID propertyID = cssPropertyID(propertyName);
24 if (propertyID == CSSPropertyInvalid) { 24 // TODO(timloh): Handle custom properties
25 if (propertyID == CSSPropertyInvalid || propertyID == CSSPropertyVariable) {
25 exceptionState.throwTypeError("Invalid property name"); 26 exceptionState.throwTypeError("Invalid property name");
26 return ScriptValue::createNull(scriptState); 27 return ScriptValue::createNull(scriptState);
27 } 28 }
28 if (isShorthandProperty(propertyID)) { 29 if (isShorthandProperty(propertyID)) {
29 exceptionState.throwTypeError("Parsing shorthand properties is not suppo rted"); 30 exceptionState.throwTypeError("Parsing shorthand properties is not suppo rted");
30 return ScriptValue::createNull(scriptState); 31 return ScriptValue::createNull(scriptState);
31 } 32 }
32 33
33 const CSSValue* cssValue = CSSParser::parseSingleValue(propertyID, value, st rictCSSParserContext()); 34 const CSSValue* cssValue = CSSParser::parseSingleValue(propertyID, value, st rictCSSParserContext());
34 if (!cssValue) 35 if (!cssValue)
35 return ScriptValue::createNull(scriptState); 36 return ScriptValue::createNull(scriptState);
36 37
37 CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleVal ueVector(propertyID, *cssValue); 38 CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleVal ueVector(propertyID, *cssValue);
38 if (styleValueVector.size() != 1) { 39 if (styleValueVector.size() != 1) {
39 // TODO(meade): Support returning a CSSStyleValueOrCSSStyleValueSequence 40 // TODO(meade): Support returning a CSSStyleValueOrCSSStyleValueSequence
40 // from this function. 41 // from this function.
41 return ScriptValue::createNull(scriptState); 42 return ScriptValue::createNull(scriptState);
42 } 43 }
43 44
44 v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->c ontext()->Global(), scriptState->isolate()); 45 v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->c ontext()->Global(), scriptState->isolate());
45 return ScriptValue(scriptState, wrappedValue); 46 return ScriptValue(scriptState, wrappedValue);
46 } 47 }
47 48
48 } // namespace blink 49 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698