Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/style/ContentData.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * 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
@@ skipping 18 matching lines @@
 #include "core/style/StyleImage.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class Document;
 class LayoutObject;
 class ComputedStyle;
 
-class ContentData : public NoBaseWillBeGarbageCollectedFinalized<ContentData> {
-    USING_FAST_MALLOC_WILL_BE_REMOVED(ContentData);
+class ContentData : public GarbageCollectedFinalized<ContentData> {
 public:
-    static PassOwnPtrWillBeRawPtr<ContentData> create(PassRefPtrWillBeRawPtr<StyleImage>);
-    static PassOwnPtrWillBeRawPtr<ContentData> create(const String&);
-    static PassOwnPtrWillBeRawPtr<ContentData> create(PassOwnPtr<CounterContent>);
-    static PassOwnPtrWillBeRawPtr<ContentData> create(QuoteType);
+    static RawPtr<ContentData> create(RawPtr<StyleImage>);
+    static RawPtr<ContentData> create(const String&);
+    static RawPtr<ContentData> create(PassOwnPtr<CounterContent>);
+    static RawPtr<ContentData> create(QuoteType);
 
     virtual ~ContentData() { }
 
     virtual bool isCounter() const { return false; }
     virtual bool isImage() const { return false; }
     virtual bool isQuote() const { return false; }
     virtual bool isText() const { return false; }
 
     virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) const = 0;
 
-    virtual PassOwnPtrWillBeRawPtr<ContentData> clone() const;
+    virtual RawPtr<ContentData> clone() const;
 
     ContentData* next() const { return m_next.get(); }
-    void setNext(PassOwnPtrWillBeRawPtr<ContentData> next) { m_next = next; }
+    void setNext(RawPtr<ContentData> next) { m_next = next; }
 
     virtual bool equals(const ContentData&) const = 0;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    virtual PassOwnPtrWillBeRawPtr<ContentData> cloneInternal() const = 0;
+    virtual RawPtr<ContentData> cloneInternal() const = 0;
 
-    OwnPtrWillBeMember<ContentData> m_next;
+    Member<ContentData> m_next;
 };
 
 #define DEFINE_CONTENT_DATA_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##ContentData, ContentData, content, content->is##typeName(), content.is##typeName())
 
 class ImageContentData final : public ContentData {
     friend class ContentData;
 public:
     const StyleImage* image() const { return m_image.get(); }
     StyleImage* image() { return m_image.get(); }
-    void setImage(PassRefPtrWillBeRawPtr<StyleImage> image) { ASSERT(image); m_image = image; }
+    void setImage(RawPtr<StyleImage> image) { ASSERT(image); m_image = image; }
 
     bool isImage() const override { return true; }
     LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override;
 
     bool equals(const ContentData& data) const override
     {
         if (!data.isImage())
             return false;
         return *static_cast<const ImageContentData&>(data).image() == *image();
     }
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    ImageContentData(PassRefPtrWillBeRawPtr<StyleImage> image)
+    ImageContentData(RawPtr<StyleImage> image)
         : m_image(image)
     {
         ASSERT(m_image);
     }
 
-    PassOwnPtrWillBeRawPtr<ContentData> cloneInternal() const override
+    RawPtr<ContentData> cloneInternal() const override
     {
-        RefPtrWillBeRawPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
+        RawPtr<StyleImage> image = const_cast<StyleImage*>(this->image());
         return create(image.release());
     }
 
-    RefPtrWillBeMember<StyleImage> m_image;
+    Member<StyleImage> m_image;
 };
 
 DEFINE_CONTENT_DATA_TYPE_CASTS(Image);
 
 class TextContentData final : public ContentData {
     friend class ContentData;
 public:
     const String& text() const { return m_text; }
     void setText(const String& text) { m_text = text; }
 
     bool isText() const override { return true; }
     LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override;
 
     bool equals(const ContentData& data) const override
     {
         if (!data.isText())
             return false;
         return static_cast<const TextContentData&>(data).text() == text();
     }
 
 private:
     TextContentData(const String& text)
         : m_text(text)
     {
     }
 
-    PassOwnPtrWillBeRawPtr<ContentData> cloneInternal() const override { return create(text()); }
+    RawPtr<ContentData> cloneInternal() const override { return create(text()); }
 
     String m_text;
 };
 
 DEFINE_CONTENT_DATA_TYPE_CASTS(Text);
 
 class CounterContentData final : public ContentData {
     friend class ContentData;
 public:
     const CounterContent* counter() const { return m_counter.get(); }
     void setCounter(PassOwnPtr<CounterContent> counter) { m_counter = counter; }
 
     bool isCounter() const override { return true; }
     LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override;
 
 private:
     CounterContentData(PassOwnPtr<CounterContent> counter)
         : m_counter(counter)
     {
     }
 
-    PassOwnPtrWillBeRawPtr<ContentData> cloneInternal() const override
+    RawPtr<ContentData> cloneInternal() const override
     {
         OwnPtr<CounterContent> counterData = adoptPtr(new CounterContent(*counter()));
         return create(counterData.release());
     }
 
     bool equals(const ContentData& data) const override
     {
         if (!data.isCounter())
             return false;
         return *static_cast<const CounterContentData&>(data).counter() == *counter();
@@ skipping 19 matching lines @@
             return false;
         return static_cast<const QuoteContentData&>(data).quote() == quote();
     }
 
 private:
     QuoteContentData(QuoteType quote)
         : m_quote(quote)
     {
     }
 
-    PassOwnPtrWillBeRawPtr<ContentData> cloneInternal() const override { return create(quote()); }
+    RawPtr<ContentData> cloneInternal() const override { return create(quote()); }
 
     QuoteType m_quote;
 };
 
 DEFINE_CONTENT_DATA_TYPE_CASTS(Quote);
 
 inline bool operator==(const ContentData& a, const ContentData& b)
 {
     return a.equals(b);
 }
 
 inline bool operator!=(const ContentData& a, const ContentData& b)
 {
     return !(a == b);
 }
 
 } // namespace blink
 
 #endif // ContentData_h