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

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

Issue 2038363002: Make CSSPropertyParser::parseSingleValue return a const CSSValue* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_remove_const_cast_in_interpolation_type
Patch Set: Rebase Created 4 years, 5 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"
(...skipping 12 matching lines...) Expand all
23 CSSPropertyID propertyID = cssPropertyID(propertyName); 23 CSSPropertyID propertyID = cssPropertyID(propertyName);
24 if (propertyID == CSSPropertyInvalid) { 24 if (propertyID == CSSPropertyInvalid) {
25 exceptionState.throwTypeError("Invalid property name"); 25 exceptionState.throwTypeError("Invalid property name");
26 return ScriptValue::createNull(scriptState); 26 return ScriptValue::createNull(scriptState);
27 } 27 }
28 if (isShorthandProperty(propertyID)) { 28 if (isShorthandProperty(propertyID)) {
29 exceptionState.throwTypeError("Parsing shorthand properties is not suppo rted"); 29 exceptionState.throwTypeError("Parsing shorthand properties is not suppo rted");
30 return ScriptValue::createNull(scriptState); 30 return ScriptValue::createNull(scriptState);
31 } 31 }
32 32
33 CSSValue* cssValue = CSSParser::parseSingleValue(propertyID, value, strictCS SParserContext()); 33 const CSSValue* cssValue = CSSParser::parseSingleValue(propertyID, value, st rictCSSParserContext());
34 if (!cssValue) 34 if (!cssValue)
35 return ScriptValue::createNull(scriptState); 35 return ScriptValue::createNull(scriptState);
36 36
37 CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleVal ueVector(propertyID, *cssValue); 37 CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleVal ueVector(propertyID, *cssValue);
38 if (styleValueVector.size() != 1) { 38 if (styleValueVector.size() != 1) {
39 // TODO(meade): Support returning a CSSStyleValueOrCSSStyleValueSequence 39 // TODO(meade): Support returning a CSSStyleValueOrCSSStyleValueSequence
40 // from this function. 40 // from this function.
41 return ScriptValue::createNull(scriptState); 41 return ScriptValue::createNull(scriptState);
42 } 42 }
43 43
44 v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->c ontext()->Global(), scriptState->isolate()); 44 v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->c ontext()->Global(), scriptState->isolate());
45 return ScriptValue(scriptState, wrappedValue); 45 return ScriptValue(scriptState, wrappedValue);
46 } 46 }
47 47
48 } // namespace blink 48 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698