third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp - Issue 2042943003: Move CSSValue->CSSStyleValue logic out of StylePropertyMap and into the StyleValueFactory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: sync to HEAD 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/cssom/CSSStyleValue.h ('k') | third_party/WebKit/Source/core/css/cssom/ComputedStylePropertyMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp

diff --git a/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp b/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp

index 9be68ea08c3e2443960e51c05c6a9c2748cf6cfd..5f8b48a905face8c4f45bb3945465b550ffc1ef7 100644

--- a/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp

+++ b/third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp

@@ -34,11 +34,14 @@ ScriptValue CSSStyleValue::parse(ScriptState* scriptState, const String& propert

if (!cssValue)

return ScriptValue::createNull(scriptState);

- CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, *cssValue);

- if (!styleValue)

+ CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleValueVector(propertyID, *cssValue);

+ if (styleValueVector.size() != 1) {

+ // TODO(meade): Support returning a CSSStyleValueOrCSSStyleValueSequence

+ // from this function.

return ScriptValue::createNull(scriptState);

+ }

- v8::Local<v8::Value> wrappedValue = toV8(styleValue, scriptState->context()->Global(), scriptState->isolate());

+ v8::Local<v8::Value> wrappedValue = toV8(styleValueVector[0], scriptState->context()->Global(), scriptState->isolate());

return ScriptValue(scriptState, wrappedValue);

}