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

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

Issue 2042943003: Move CSSValue->CSSStyleValue logic out of StylePropertyMap and into the StyleValueFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylevaue
Patch Set: Created 4 years, 6 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 16 matching lines...) Expand all
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 CSSValue* cssValue = CSSParser::parseSingleValue(propertyID, value, strictCS SParserContext());
34 if (!cssValue) 34 if (!cssValue)
35 return ScriptValue::createNull(scriptState); 35 return ScriptValue::createNull(scriptState);
36 36
37 CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, *cssValue) ; 37 CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleVal ueVector(propertyID, *cssValue);
38 if (!styleValue) 38 if (styleValueVector.size() != 1)
Timothy Loh 2016/06/08 04:19:17 should put a TODO to handle this case
meade_UTC10 2016/06/08 07:13:16 Done.
39 return ScriptValue::createNull(scriptState); 39 return ScriptValue::createNull(scriptState);
40 40
41 v8::Local<v8::Value> wrappedValue = toV8(styleValue, scriptState->context()- >Global(), scriptState->isolate()); 41 v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->c ontext()->Global(), scriptState->isolate());
42 return ScriptValue(scriptState, wrappedValue); 42 return ScriptValue(scriptState, wrappedValue);
43 } 43 }
44 44
45 } // namespace blink 45 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698