| Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| index fdcb3f635ed95e4eb76e22d5aa96f43c3d38914f..dd686597bdff2afb4b06c8140f040842bc7f7919 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
|
| @@ -1859,6 +1859,17 @@ const CSSValue* ComputedStyle::getRegisteredVariable(
|
| : nullptr;
|
| }
|
|
|
| +const CSSValue* ComputedStyle::getRegisteredVariable(
|
| + const AtomicString& name) const {
|
| + // Registered custom properties are by default non-inheriting so check there
|
| + // first.
|
| + const CSSValue* result = getRegisteredVariable(name, false);
|
| + if (result) {
|
| + return result;
|
| + }
|
| + return getRegisteredVariable(name, true);
|
| +}
|
| +
|
| float ComputedStyle::wordSpacing() const {
|
| return getFontDescription().wordSpacing();
|
| }
|
|
|