Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CanvasRenderingContext2DState_h
 #define CanvasRenderingContext2DState_h
 
 #include "core/css/CSSFontSelectorClient.h"
 #include "modules/canvas2d/ClipList.h"
 #include "platform/fonts/Font.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class CanvasStyle;
 class CSSValue;
 class Element;
 
-class CanvasRenderingContext2DState final : public NoBaseWillBeGarbageCollectedFinalized<CanvasRenderingContext2DState>, public CSSFontSelectorClient {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2DState);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(CanvasRenderingContext2DState);
+class CanvasRenderingContext2DState final : public GarbageCollectedFinalized<CanvasRenderingContext2DState>, public CSSFontSelectorClient {
+    USING_GARBAGE_COLLECTED_MIXIN(CanvasRenderingContext2DState);
 public:
-    static PassOwnPtrWillBeRawPtr<CanvasRenderingContext2DState> create()
+    static RawPtr<CanvasRenderingContext2DState> create()
     {
-        return adoptPtrWillBeNoop(new CanvasRenderingContext2DState);
+        return (new CanvasRenderingContext2DState);
     }
 
     ~CanvasRenderingContext2DState() override;
 
     DECLARE_VIRTUAL_TRACE();
 
     enum ClipListCopyMode {
         CopyClipList,
         DontCopyClipList
     };
 
     enum PaintType {
         FillPaintType,
         StrokePaintType,
         ImagePaintType,
     };
 
-    static PassOwnPtrWillBeRawPtr<CanvasRenderingContext2DState> create(const CanvasRenderingContext2DState& other, ClipListCopyMode mode)
+    static RawPtr<CanvasRenderingContext2DState> create(const CanvasRenderingContext2DState& other, ClipListCopyMode mode)
     {
-        return adoptPtrWillBeNoop(new CanvasRenderingContext2DState(other, mode));
+        return (new CanvasRenderingContext2DState(other, mode));
     }
     CanvasRenderingContext2DState& operator=(const CanvasRenderingContext2DState&);
 
     // CSSFontSelectorClient implementation
     void fontsNeedUpdate(CSSFontSelector*) override;
 
     bool hasUnrealizedSaves() const { return m_unrealizedSaveCount; }
     void save() { ++m_unrealizedSaveCount; }
     void restore() { --m_unrealizedSaveCount; }
     void resetUnrealizedSaveCount() { m_unrealizedSaveCount = 0; }
@@ skipping 18 matching lines @@
     bool hasComplexClip() const { return m_hasComplexClip; }
     void playbackClips(SkCanvas* canvas) const { m_clipList.playback(canvas); }
     SkPath intersectPathWithClip(const SkPath& path) const { return m_clipList.intersectPathWithClip(path); }
 
     void setFont(const Font&, CSSFontSelector*);
     const Font& font() const;
     bool hasRealizedFont() const { return m_realizedFont; }
     void setUnparsedFont(const String& font) { m_unparsedFont = font; }
     const String& unparsedFont() const { return m_unparsedFont; }
 
-    void setFilter(PassRefPtrWillBeRawPtr<CSSValue>);
+    void setFilter(RawPtr<CSSValue>);
     void setUnparsedFilter(const String& filterString) { m_unparsedFilter = filterString; }
     const String& unparsedFilter() const { return m_unparsedFilter; }
     SkImageFilter* getFilter(Element*, const Font&, IntSize canvasSize) const;
     bool hasFilter(Element*, const Font&, IntSize canvasSize) const;
 
     void setStrokeStyle(CanvasStyle*);
     CanvasStyle* strokeStyle() const { return m_strokeStyle.get(); }
 
     void setFillStyle(CanvasStyle*);
     CanvasStyle* fillStyle() const { return m_fillStyle.get(); }
@@ skipping 78 matching lines @@
     SkDrawLooper* emptyDrawLooper() const;
     SkDrawLooper* shadowOnlyDrawLooper() const;
     SkDrawLooper* shadowAndForegroundDrawLooper() const;
     SkImageFilter* shadowOnlyImageFilter() const;
     SkImageFilter* shadowAndForegroundImageFilter() const;
 
     unsigned m_unrealizedSaveCount;
 
     String m_unparsedStrokeColor;
     String m_unparsedFillColor;
-    PersistentWillBeMember<CanvasStyle> m_strokeStyle;
-    PersistentWillBeMember<CanvasStyle> m_fillStyle;
+    Member<CanvasStyle> m_strokeStyle;
+    Member<CanvasStyle> m_fillStyle;
 
     mutable SkPaint m_strokePaint;
     mutable SkPaint m_fillPaint;
     mutable SkPaint m_imagePaint;
 
     FloatSize m_shadowOffset;
     double m_shadowBlur;
     SkColor m_shadowColor;
     mutable RefPtr<SkDrawLooper> m_emptyDrawLooper;
     mutable RefPtr<SkDrawLooper> m_shadowOnlyDrawLooper;
     mutable RefPtr<SkDrawLooper> m_shadowAndForegroundDrawLooper;
     mutable RefPtr<SkImageFilter> m_shadowOnlyImageFilter;
     mutable RefPtr<SkImageFilter> m_shadowAndForegroundImageFilter;
 
     double m_globalAlpha;
     AffineTransform m_transform;
     Vector<double> m_lineDash;
     double m_lineDashOffset;
 
     String m_unparsedFont;
     Font m_font;
 
     String m_unparsedFilter;
-    RefPtrWillBeMember<CSSValue> m_filterValue;
+    Member<CSSValue> m_filterValue;
     mutable RefPtr<SkImageFilter> m_resolvedFilter;
 
     // Text state.
     TextAlign m_textAlign;
     TextBaseline m_textBaseline;
     Direction m_direction;
 
     bool m_realizedFont : 1;
     bool m_isTransformInvertible : 1;
     bool m_hasClip : 1;
     bool m_hasComplexClip : 1;
     mutable bool m_fillStyleDirty : 1;
     mutable bool m_strokeStyleDirty : 1;
     mutable bool m_lineDashDirty : 1;
 
     bool m_imageSmoothingEnabled;
     SkFilterQuality m_imageSmoothingQuality;
 
     ClipList m_clipList;
 };
 
 } // namespace blink
 
 #endif