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 265feb12c230de22bdb74aadb2efc5b85e10e47f..1ef494c43a40280d7d4b1ac015fe88eda74060e6 100644 |
--- a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp |
+++ b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.cpp |
@@ -6,12 +6,12 @@ |
#include "bindings/core/v8/ExceptionState.h" |
#include "core/css/cssom/CSSSimpleLength.h" |
-#include "core/css/cssom/StyleValue.h" |
+#include "core/css/cssom/CSSStyleValue.h" |
#include "core/css/cssom/StyleValueFactory.h" |
namespace blink { |
-StyleValue* StylePropertyMap::get(const String& propertyName, ExceptionState& exceptionState) |
+CSSStyleValue* StylePropertyMap::get(const String& propertyName, ExceptionState& exceptionState) |
{ |
CSSPropertyID propertyID = cssPropertyID(propertyName); |
if (propertyID == CSSPropertyInvalid) { |
@@ -49,7 +49,7 @@ bool StylePropertyMap::has(const String& propertyName, ExceptionState& exception |
return false; |
} |
-void StylePropertyMap::set(const String& propertyName, StyleValueOrStyleValueSequenceOrString& item, ExceptionState& exceptionState) |
+void StylePropertyMap::set(const String& propertyName, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState) |
{ |
CSSPropertyID propertyID = cssPropertyID(propertyName); |
if (propertyID != CSSPropertyInvalid) { |
@@ -60,7 +60,7 @@ void StylePropertyMap::set(const String& propertyName, StyleValueOrStyleValueSeq |
exceptionState.throwTypeError("Invalid propertyName: " + propertyName); |
} |
-void StylePropertyMap::append(const String& propertyName, StyleValueOrStyleValueSequenceOrString& item, ExceptionState& exceptionState) |
+void StylePropertyMap::append(const String& propertyName, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState) |
{ |
CSSPropertyID propertyID = cssPropertyID(propertyName); |
if (propertyID != CSSPropertyInvalid) { |
@@ -87,14 +87,14 @@ StylePropertyMap::StyleValueVector StylePropertyMap::cssValueToStyleValueVector( |
StyleValueVector styleValueVector; |
if (!cssValue.isValueList()) { |
- StyleValue* styleValue = StyleValueFactory::create(propertyID, cssValue); |
+ CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, cssValue); |
if (styleValue) |
styleValueVector.append(styleValue); |
return styleValueVector; |
} |
for (CSSValue* value : *toCSSValueList(&cssValue)) { |
- StyleValue* styleValue = StyleValueFactory::create(propertyID, *value); |
+ CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, *value); |
if (!styleValue) |
return StyleValueVector(); |
styleValueVector.append(styleValue); |