Remove tons of OILPAN.

sky/engine/core/css/StylePropertySet.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 27 matching lines @@
 class ImmutableStylePropertySet;
 class KURL;
 class MutableStylePropertySet;
 class StylePropertyShorthand;
 class StyleSheetContents;
 
 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:
         PropertyReference(const StylePropertySet& propertySet, unsigned index)
             : m_propertySet(propertySet)
             , m_index(index)
         {
         }
 
         CSSPropertyID id() const { return static_cast<CSSPropertyID>(propertyMetadata().m_propertyID); }
@@ skipping 51 matching lines @@
     bool hasFailedOrCanceledSubresources() const;
 
     static unsigned averageSizeInBytes();
 
 #ifndef NDEBUG
     void showStyle();
 #endif
 
     bool propertyMatches(CSSPropertyID, const CSSValue*) const;
 
-    void trace(Visitor*);
-    void traceAfterDispatch(Visitor*) { }
-
 protected:
 
     enum { MaxArraySize = (1 << 28) - 1 };
 
     StylePropertySet(CSSParserMode cssParserMode)
         : m_cssParserMode(cssParserMode)
         , m_isMutable(true)
         , m_arraySize(0)
     { }
 
@@ skipping 14 matching lines @@
 public:
     ~ImmutableStylePropertySet();
     static PassRefPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
 
     const RawPtr<CSSValue>* valueArray() const;
     const StylePropertyMetadata* metadataArray() const;
     int findPropertyIndex(CSSPropertyID) const;
 
-    void traceAfterDispatch(Visitor*);
-
     void* operator new(std::size_t, void* location)
     {
         return location;
     }
 
     void* m_storage;
 
 private:
     ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
 };
@@ skipping 40 matching lines @@
     void removeEquivalentProperties(const CSSStyleDeclaration*);
 
     void mergeAndOverrideOnConflict(const StylePropertySet*);
 
     void clear();
     void parseDeclaration(const String& styleDeclaration, StyleSheetContents* contextStyleSheet);
 
     CSSStyleDeclaration* ensureCSSStyleDeclaration();
     int findPropertyIndex(CSSPropertyID) const;
 
-    void traceAfterDispatch(Visitor*);
-
 private:
     explicit MutableStylePropertySet(CSSParserMode);
     explicit MutableStylePropertySet(const StylePropertySet&);
     MutableStylePropertySet(const CSSProperty* properties, unsigned count);
 
     bool removeShorthandProperty(CSSPropertyID);
     CSSProperty* findCSSPropertyWithID(CSSPropertyID);
     OwnPtr<PropertySetCSSStyleDeclaration> m_cssomWrapper;
 
     friend class StylePropertySet;
@@ skipping 50 matching lines @@
 inline int StylePropertySet::findPropertyIndex(CSSPropertyID propertyID) const
 {
     if (m_isMutable)
         return toMutableStylePropertySet(this)->findPropertyIndex(propertyID);
     return toImmutableStylePropertySet(this)->findPropertyIndex(propertyID);
 }
 
 } // namespace blink
 
 #endif // StylePropertySet_h