Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSCanvasValue.h

Index: Source/core/css/CSSCanvasValue.h
diff --git a/Source/core/css/CSSCanvasValue.h b/Source/core/css/CSSCanvasValue.h
index 4e15b7f9befe814fefd5542be805a764af347279..15dfed1cd7f9115465f3e636a3a8b29eb2023e68 100644
--- a/Source/core/css/CSSCanvasValue.h
+++ b/Source/core/css/CSSCanvasValue.h
@@ -35,9 +35,9 @@ class Document;
 
 class CSSCanvasValue : public CSSImageGeneratorValue {
 public:
-    static PassRefPtrWillBeRawPtr<CSSCanvasValue> create(const String& name)
+    static PassRefPtr<CSSCanvasValue> create(const String& name)
     {
-        return adoptRefWillBeNoop(new CSSCanvasValue(name));
+        return adoptRef(new CSSCanvasValue(name));
     }
     ~CSSCanvasValue();
 
@@ -52,8 +52,6 @@ public:
 
     bool equals(const CSSCanvasValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
 private:
     explicit CSSCanvasValue(const String& name)
         : CSSImageGeneratorValue(CanvasClass)
@@ -86,12 +84,11 @@ private:
 #endif
         DEFINE_INLINE_VIRTUAL_TRACE()
         {
-            visitor->trace(m_ownerValue);
             CanvasObserver::trace(visitor);
         }
 
     private:
-        RawPtrWillBeMember<CSSCanvasValue> m_ownerValue;
+        RawPtr<CSSCanvasValue> m_ownerValue;
     };
 
     void canvasChanged(HTMLCanvasElement*, const FloatRect& changedRect);
@@ -103,12 +100,16 @@ private:
 
     HTMLCanvasElement* element(Document*);
 
-    OwnPtrWillBeMember<CanvasObserverProxy> m_canvasObserver;
+    OwnPtrWillBePersistent<CanvasObserverProxy> m_canvasObserver;
 
     // The name of the canvas.
     String m_name;
     // The document supplies the element and owns it.
-    RawPtrWillBeWeakMember<HTMLCanvasElement> m_element;
+#if ENABLE(OILPAN)
+    WeakPersistent<HTMLCanvasElement> m_element;
+#else
+    RawPtr<HTMLCanvasElement> m_element;
+#endif
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSCanvasValue, isCanvasValue());