Revert of Oilpan: Move CSSStyleDeclaration and subclasses to the heap using transistion types.

Source/core/css/PropertySetCSSStyleDeclaration.h

Index: Source/core/css/PropertySetCSSStyleDeclaration.h
diff --git a/Source/core/css/PropertySetCSSStyleDeclaration.h b/Source/core/css/PropertySetCSSStyleDeclaration.h
index 972911b856566cabb298c42ad088c6ebe9f3f5c0..ad87376dc9b826cfd0059776146be98acb43361b 100644
--- a/Source/core/css/PropertySetCSSStyleDeclaration.h
+++ b/Source/core/css/PropertySetCSSStyleDeclaration.h
@@ -46,8 +46,6 @@
     virtual void clearParentElement() { ASSERT_NOT_REACHED(); }
     StyleSheetContents* contextStyleSheet() const;
 
-    virtual void trace(Visitor*) OVERRIDE;
-
 private:
     virtual CSSRule* parentRule() const OVERRIDE { return 0; }
     virtual unsigned length() const OVERRIDE FINAL;
@@ -76,44 +74,36 @@
     virtual void didMutate(MutationType) { }
     virtual MutableStylePropertySet& propertySet() const = 0;
 
-    OwnPtrWillBeMember<WillBeHeapHashMap<RawPtrWillBeMember<CSSValue>, RefPtrWillBeMember<CSSValue> > > m_cssomCSSValueClones;
+    OwnPtrWillBePersistent<WillBeHeapHashMap<CSSValue*, RefPtrWillBeMember<CSSValue> > > m_cssomCSSValueClones;
 };
 
 class PropertySetCSSStyleDeclaration : public AbstractPropertySetCSSStyleDeclaration {
 public:
     PropertySetCSSStyleDeclaration(MutableStylePropertySet& propertySet) : m_propertySet(&propertySet) { }
 
-#if !ENABLE(OILPAN)
     virtual void ref() OVERRIDE;
     virtual void deref() OVERRIDE;
-#endif
-
-    virtual void trace(Visitor*) OVERRIDE;
 
 protected:
     virtual MutableStylePropertySet& propertySet() const OVERRIDE FINAL { ASSERT(m_propertySet); return *m_propertySet; }
 
-    RawPtrWillBeMember<MutableStylePropertySet> m_propertySet; // Cannot be null
+    MutableStylePropertySet* m_propertySet; // Cannot be null
 };
 
 class StyleRuleCSSStyleDeclaration FINAL : public PropertySetCSSStyleDeclaration
 {
 public:
-    static PassRefPtrWillBeRawPtr<StyleRuleCSSStyleDeclaration> create(MutableStylePropertySet& propertySet, CSSRule* parentRule)
+    static PassRefPtr<StyleRuleCSSStyleDeclaration> create(MutableStylePropertySet& propertySet, CSSRule* parentRule)
     {
-        return adoptRefWillBeNoop(new StyleRuleCSSStyleDeclaration(propertySet, parentRule));
+        return adoptRef(new StyleRuleCSSStyleDeclaration(propertySet, parentRule));
     }
 
-#if !ENABLE(OILPAN)
-    void clearParentRule() { m_parentRule = nullptr; }
+    void clearParentRule() { m_parentRule = 0; }
 
     virtual void ref() OVERRIDE;
     virtual void deref() OVERRIDE;
-#endif
 
     void reattach(MutableStylePropertySet&);
-
-    virtual void trace(Visitor*) OVERRIDE;
 
 private:
     StyleRuleCSSStyleDeclaration(MutableStylePropertySet&, CSSRule*);
@@ -126,10 +116,8 @@
     virtual void willMutate() OVERRIDE;
     virtual void didMutate(MutationType) OVERRIDE;
 
-#if !ENABLE(OILPAN)
     unsigned m_refCount;
-#endif
-    RawPtrWillBeMember<CSSRule> m_parentRule;
+    CSSRule* m_parentRule;
 };
 
 class InlineCSSStyleDeclaration FINAL : public AbstractPropertySetCSSStyleDeclaration
@@ -140,14 +128,10 @@
     {
     }
 
-    virtual void trace(Visitor*) OVERRIDE;
-
 private:
     virtual MutableStylePropertySet& propertySet() const OVERRIDE;
-#if !ENABLE(OILPAN)
     virtual void ref() OVERRIDE;
     virtual void deref() OVERRIDE;
-#endif
     virtual CSSStyleSheet* parentStyleSheet() const OVERRIDE;
     virtual Element* parentElement() const OVERRIDE { return m_parentElement; }
     virtual void clearParentElement() OVERRIDE { m_parentElement = 0; }