Index: third_party/WebKit/Source/core/css/cssom/StylePropertyMap.h |
diff --git a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.h b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.h |
index e2dfad65f2107251ac0cd499d5aecd880db0268a..0da6aef6bca2112e9919314e0bb83ea4e83a6444 100644 |
--- a/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.h |
+++ b/third_party/WebKit/Source/core/css/cssom/StylePropertyMap.h |
@@ -5,28 +5,28 @@ |
#ifndef StylePropertyMap_h |
#define StylePropertyMap_h |
+#include "bindings/core/v8/CSSStyleValueOrCSSStyleValueSequence.h" |
+#include "bindings/core/v8/CSSStyleValueOrCSSStyleValueSequenceOrString.h" |
#include "bindings/core/v8/Iterable.h" |
#include "bindings/core/v8/ScriptWrappable.h" |
-#include "bindings/core/v8/StyleValueOrStyleValueSequence.h" |
-#include "bindings/core/v8/StyleValueOrStyleValueSequenceOrString.h" |
#include "core/CSSPropertyNames.h" |
#include "core/CoreExport.h" |
-#include "core/css/cssom/StyleValue.h" |
+#include "core/css/cssom/CSSStyleValue.h" |
namespace blink { |
class ExceptionState; |
-class CORE_EXPORT StylePropertyMap : public GarbageCollectedFinalized<StylePropertyMap>, public ScriptWrappable, public PairIterable<String, StyleValueOrStyleValueSequence> { |
+class CORE_EXPORT StylePropertyMap : public GarbageCollectedFinalized<StylePropertyMap>, public ScriptWrappable, public PairIterable<String, CSSStyleValueOrCSSStyleValueSequence> { |
WTF_MAKE_NONCOPYABLE(StylePropertyMap); |
DEFINE_WRAPPERTYPEINFO(); |
public: |
- typedef HeapVector<Member<StyleValue>> StyleValueVector; |
+ typedef HeapVector<Member<CSSStyleValue>> StyleValueVector; |
virtual ~StylePropertyMap() { } |
// Accessors. |
- StyleValue* get(const String& propertyName, ExceptionState&); |
+ CSSStyleValue* get(const String& propertyName, ExceptionState&); |
StyleValueVector getAll(const String& propertyName, ExceptionState&); |
bool has(const String& propertyName, ExceptionState&); |
@@ -36,12 +36,12 @@ public: |
virtual Vector<String> getProperties() = 0; |
// Modifiers. |
- void set(const String& propertyName, StyleValueOrStyleValueSequenceOrString& item, ExceptionState&); |
- void append(const String& propertyName, StyleValueOrStyleValueSequenceOrString& item, ExceptionState&); |
+ void set(const String& propertyName, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState&); |
+ void append(const String& propertyName, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState&); |
void remove(const String& propertyName, ExceptionState&); |
- virtual void set(CSSPropertyID, StyleValueOrStyleValueSequenceOrString& item, ExceptionState&) = 0; |
- virtual void append(CSSPropertyID, StyleValueOrStyleValueSequenceOrString& item, ExceptionState&) = 0; |
+ virtual void set(CSSPropertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState&) = 0; |
+ virtual void append(CSSPropertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState&) = 0; |
virtual void remove(CSSPropertyID, ExceptionState&) = 0; |
DEFINE_INLINE_VIRTUAL_TRACE() { } |