| Index: third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
|
| index 4e56ef6b250774a22471ecd668928a39b76a75f5..6613ef05e68f257ac43d6410604a90aadf58718b 100644
|
| --- a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
|
| +++ b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp
|
| @@ -68,12 +68,15 @@ CSSStyleValue* StylePropertyMap::get(const String& propertyName,
|
| CSSStyleValueVector StylePropertyMap::getAll(const String& propertyName,
|
| ExceptionState& exceptionState) {
|
| CSSPropertyID propertyID = cssPropertyID(propertyName);
|
| - if (propertyID != CSSPropertyInvalid && propertyID != CSSPropertyVariable)
|
| - return getAllInternal(propertyID);
|
| + if (propertyID == CSSPropertyInvalid) {
|
| + exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
|
| + return CSSStyleValueVector();
|
| + }
|
|
|
| - // TODO(meade): Handle custom properties here.
|
| - exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
|
| - return CSSStyleValueVector();
|
| + if (propertyID == CSSPropertyVariable)
|
| + return getAllInternal(propertyName);
|
| +
|
| + return getAllInternal(propertyID);
|
| }
|
|
|
| bool StylePropertyMap::has(const String& propertyName,
|
|
|