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

Unified Diff: third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp

Issue 2791193004: [Typed CSSOM] New design for computed styles which includes custom properties (Closed)
Patch Set: tidy up Created 3 years, 8 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
Index: third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp b/third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp
index ec017d9bafe9e1c6aa84ea269c255665b7f8f987..b90209c0df553c0f2fc32b2ffdac0a8954bc30a0 100644
--- a/third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/FilteredComputedStylePropertyMap.cpp
@@ -37,7 +37,7 @@ CSSStyleValue* FilteredComputedStylePropertyMap::get(
if (propertyID == CSSPropertyVariable &&
m_customProperties.contains(AtomicString(propertyName))) {
CSSStyleValueVector styleVector =
- getAllInternal(AtomicString(propertyName));
+ getAllInternal(AtomicString(propertyName), exceptionState);
if (styleVector.isEmpty())
return nullptr;
@@ -57,7 +57,7 @@ CSSStyleValueVector FilteredComputedStylePropertyMap::getAll(
if (propertyID == CSSPropertyVariable &&
m_customProperties.contains(AtomicString(propertyName)))
- return getAllInternal(AtomicString(propertyName));
+ return getAllInternal(AtomicString(propertyName), exceptionState);
exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
return CSSStyleValueVector();
@@ -70,8 +70,10 @@ bool FilteredComputedStylePropertyMap::has(const String& propertyName,
return !getAllInternal(propertyID).isEmpty();
if (propertyID == CSSPropertyVariable &&
- m_customProperties.contains(AtomicString(propertyName)))
- return !getAllInternal(AtomicString(propertyName)).isEmpty();
+ m_customProperties.contains(AtomicString(propertyName))) {
+ return !getAllInternal(AtomicString(propertyName), exceptionState)
+ .isEmpty();
+ }
exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
return false;

Powered by Google App Engine
This is Rietveld 408576698