Oilpan: Unship Oilpan from CSSValues

Source/core/css/CSSCanvasValue.h

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 #include "core/css/CSSImageGeneratorValue.h"
 #include "core/html/HTMLCanvasElement.h"
 
 namespace blink {
 
 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();
 
     String customCSSText() const;
 
     PassRefPtr<Image> image(LayoutObject*, const IntSize&);
     bool isFixedSize() const { return true; }
     IntSize fixedSize(const LayoutObject*);
 
     bool isPending() const { return false; }
     void loadSubimages(Document*) { }
 
     bool equals(const CSSCanvasValue&) const;
 
-    DECLARE_TRACE_AFTER_DISPATCH();
-
 private:
     explicit CSSCanvasValue(const String& name)
         : CSSImageGeneratorValue(CanvasClass)
         , m_canvasObserver(adoptPtrWillBeNoop(new CanvasObserverProxy(this)))
         , m_name(name)
         , m_element(nullptr)
     {
     }
 
     // NOTE: We put the CanvasObserver in a member instead of inheriting from it
@@ skipping 12 matching lines @@
             m_ownerValue->canvasResized(canvas);
         }
 #if !ENABLE(OILPAN)
         void canvasDestroyed(HTMLCanvasElement* canvas) override
         {
             m_ownerValue->canvasDestroyed(canvas);
         }
 #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);
     void canvasResized(HTMLCanvasElement*);
 
 #if !ENABLE(OILPAN)
     void canvasDestroyed(HTMLCanvasElement*);
 #endif
 
     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());
 
 } // namespace blink
 
 #endif // CSSCanvasValue_h