| Index: third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| index 808fc944b0205ab9c9af9731ff9265d14a8286fb..3e0ba1c50769034d2fa97a2387ce33d36595934e 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
|
| @@ -35,9 +35,9 @@ class CSSValue;
|
| class ExceptionState;
|
| class MutableStylePropertySet;
|
|
|
| -class CORE_EXPORT CSSStyleDeclaration : public NoBaseWillBeGarbageCollectedFinalized<CSSStyleDeclaration>, public ScriptWrappable {
|
| +class CORE_EXPORT CSSStyleDeclaration : public GarbageCollectedFinalized<CSSStyleDeclaration>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| - WTF_MAKE_NONCOPYABLE(CSSStyleDeclaration); USING_FAST_MALLOC_WILL_BE_REMOVED(CSSStyleDeclaration);
|
| + WTF_MAKE_NONCOPYABLE(CSSStyleDeclaration);
|
| public:
|
| virtual ~CSSStyleDeclaration() { }
|
|
|
| @@ -69,7 +69,7 @@ public:
|
| // CSSPropertyID versions of the CSSOM functions to support bindings and editing.
|
| // Use the non-virtual methods in the concrete subclasses when possible.
|
| // The CSSValue returned by this function should not be exposed to the web as it may be used by multiple documents at the same time.
|
| - virtual PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) = 0;
|
| + virtual RawPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) = 0;
|
| virtual String getPropertyValueInternal(CSSPropertyID) = 0;
|
| virtual void setPropertyInternal(CSSPropertyID, const String& propertyValue, const String& value, bool important, ExceptionState&) = 0;
|
|
|
|
|