| Index: sky/engine/core/css/StylePropertySet.h
|
| diff --git a/sky/engine/core/css/StylePropertySet.h b/sky/engine/core/css/StylePropertySet.h
|
| index 69c09607bd4c77cb469a5687bdc58e090b4c20b8..17ae7f36b48bec030f08193b7aa55f128ec1700d 100644
|
| --- a/sky/engine/core/css/StylePropertySet.h
|
| +++ b/sky/engine/core/css/StylePropertySet.h
|
| @@ -45,16 +45,9 @@ class StylePropertySet : public RefCounted<StylePropertySet> {
|
| friend class PropertyReference;
|
| public:
|
|
|
| -#if ENABLE(OILPAN)
|
| - // When oilpan is enabled override the finalize method to dispatch to the subclasses'
|
| - // destructor. This can be removed once the MutableStylePropertySet's OwnPtr is moved
|
| - // to the heap.
|
| - void finalizeGarbageCollectedObject();
|
| -#else
|
| // Override RefCounted's deref() to ensure operator delete is called on
|
| // the appropriate subclass type.
|
| void deref();
|
| -#endif
|
|
|
| class PropertyReference {
|
| public:
|
| @@ -126,9 +119,6 @@ public:
|
|
|
| bool propertyMatches(CSSPropertyID, const CSSValue*) const;
|
|
|
| - void trace(Visitor*);
|
| - void traceAfterDispatch(Visitor*) { }
|
| -
|
| protected:
|
|
|
| enum { MaxArraySize = (1 << 28) - 1 };
|
| @@ -163,8 +153,6 @@ public:
|
| const StylePropertyMetadata* metadataArray() const;
|
| int findPropertyIndex(CSSPropertyID) const;
|
|
|
| - void traceAfterDispatch(Visitor*);
|
| -
|
| void* operator new(std::size_t, void* location)
|
| {
|
| return location;
|
| @@ -225,8 +213,6 @@ public:
|
| CSSStyleDeclaration* ensureCSSStyleDeclaration();
|
| int findPropertyIndex(CSSPropertyID) const;
|
|
|
| - void traceAfterDispatch(Visitor*);
|
| -
|
| private:
|
| explicit MutableStylePropertySet(CSSParserMode);
|
| explicit MutableStylePropertySet(const StylePropertySet&);
|
|
|