Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/css/StylePropertySet.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 22 matching lines @@
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 
 namespace blink {
 
 class CSSStyleDeclaration;
 class ImmutableStylePropertySet;
 class MutableStylePropertySet;
 class StyleSheetContents;
 
-class CORE_EXPORT StylePropertySet : public RefCountedWillBeGarbageCollectedFinalized<StylePropertySet> {
+class CORE_EXPORT StylePropertySet : public GarbageCollectedFinalized<StylePropertySet> {
     WTF_MAKE_NONCOPYABLE(StylePropertySet);
     friend class PropertyReference;
 public:
 
 #if ENABLE(OILPAN)
     // When oilpan is enabled override the finalize method to dispatch to the subclasses'
     // destructor. This can be removed once the MutableStylePropertySet's OwnPtr is moved
     // to the heap.
     void finalizeGarbageCollectedObject();
 #else
@@ skipping 23 matching lines @@
         CSSValue* value() { return const_cast<CSSValue*>(propertyValue()); }
 
         // FIXME: Remove this.
         CSSProperty toCSSProperty() const { return CSSProperty(propertyMetadata(), const_cast<CSSValue*>(propertyValue())); }
 
         const StylePropertyMetadata& propertyMetadata() const;
 
     private:
         const CSSValue* propertyValue() const;
 
-        RawPtrWillBeMember<const StylePropertySet> m_propertySet;
+        Member<const StylePropertySet> m_propertySet;
         unsigned m_index;
     };
 
     unsigned propertyCount() const;
     bool isEmpty() const;
     PropertyReference propertyAt(unsigned index) const { return PropertyReference(*this, index); }
 
     template<typename T> // CSSPropertyID or AtomicString
     int findPropertyIndex(T property) const;
 
     bool hasProperty(CSSPropertyID property) const { return findPropertyIndex(property) != -1; }
 
     template<typename T> // CSSPropertyID or AtomicString
-    PassRefPtrWillBeRawPtr<CSSValue> getPropertyCSSValue(T property) const;
+    RawPtr<CSSValue> getPropertyCSSValue(T property) const;
 
     template<typename T> // CSSPropertyID or AtomicString
     String getPropertyValue(T property) const;
 
     template<typename T> // CSSPropertyID or AtomicString
     bool propertyIsImportant(T property) const;
 
     bool shorthandIsImportant(CSSPropertyID) const;
     bool shorthandIsImportant(AtomicString customPropertyName) const;
 
     CSSPropertyID getPropertyShorthand(CSSPropertyID) const;
     bool isPropertyImplicit(CSSPropertyID) const;
 
     CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
 
-    PassRefPtrWillBeRawPtr<MutableStylePropertySet> mutableCopy() const;
-    PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
+    RawPtr<MutableStylePropertySet> mutableCopy() const;
+    RawPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
 
-    PassRefPtrWillBeRawPtr<MutableStylePropertySet> copyPropertiesInSet(const Vector<CSSPropertyID>&) const;
+    RawPtr<MutableStylePropertySet> copyPropertiesInSet(const Vector<CSSPropertyID>&) const;
 
     String asText() const;
 
     bool isMutable() const { return m_isMutable; }
 
     bool hasFailedOrCanceledSubresources() const;
 
     static unsigned averageSizeInBytes();
 
 #ifndef NDEBUG
@@ skipping 24 matching lines @@
     unsigned m_cssParserMode : 3;
     mutable unsigned m_isMutable : 1;
     unsigned m_arraySize : 28;
 
     friend class PropertySetCSSStyleDeclaration;
 };
 
 class CORE_EXPORT ImmutableStylePropertySet : public StylePropertySet {
 public:
     ~ImmutableStylePropertySet();
-    static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
+    static RawPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
 
     unsigned propertyCount() const { return m_arraySize; }
 
-    const RawPtrWillBeMember<CSSValue>* valueArray() const;
+    const Member<CSSValue>* valueArray() const;
     const StylePropertyMetadata* metadataArray() const;
 
     template<typename T> // CSSPropertyID or AtomicString
     int findPropertyIndex(T property) const;
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
     void* operator new(std::size_t, void* location)
     {
         return location;
     }
 
     void* m_storage;
 
 private:
     ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
 };
 
-inline const RawPtrWillBeMember<CSSValue>* ImmutableStylePropertySet::valueArray() const
+inline const Member<CSSValue>* ImmutableStylePropertySet::valueArray() const
 {
-    return reinterpret_cast<const RawPtrWillBeMember<CSSValue>*>(const_cast<const void**>(&(this->m_storage)));
+    return reinterpret_cast<const Member<CSSValue>*>(const_cast<const void**>(&(this->m_storage)));
 }
 
 inline const StylePropertyMetadata* ImmutableStylePropertySet::metadataArray() const
 {
-    return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>(&(this->m_storage))[m_arraySize * sizeof(RawPtrWillBeMember<CSSValue>)]);
+    return reinterpret_cast<const StylePropertyMetadata*>(&reinterpret_cast<const char*>(&(this->m_storage))[m_arraySize * sizeof(Member<CSSValue>)]);
 }
 
 DEFINE_TYPE_CASTS(ImmutableStylePropertySet, StylePropertySet, set, !set->isMutable(), !set.isMutable());
 
 class CORE_EXPORT MutableStylePropertySet : public StylePropertySet {
 public:
     ~MutableStylePropertySet() { }
-    static PassRefPtrWillBeRawPtr<MutableStylePropertySet> create(CSSParserMode);
-    static PassRefPtrWillBeRawPtr<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
+    static RawPtr<MutableStylePropertySet> create(CSSParserMode);
+    static RawPtr<MutableStylePropertySet> create(const CSSProperty* properties, unsigned count);
 
     unsigned propertyCount() const { return m_propertyVector.size(); }
 
     // Returns whether this style set was changed.
-    bool addParsedProperties(const WillBeHeapVector<CSSProperty, 256>&);
+    bool addParsedProperties(const HeapVector<CSSProperty, 256>&);
     bool addRespectingCascade(const CSSProperty&);
 
     // These expand shorthand properties into multiple properties.
     bool setProperty(CSSPropertyID unresolvedProperty, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
     bool setProperty(const AtomicString& customPropertyName, const String& value, bool important = false, StyleSheetContents* contextStyleSheet = 0);
-    void setProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool important = false);
+    void setProperty(CSSPropertyID, RawPtr<CSSValue>, bool important = false);
 
     // These do not. FIXME: This is too messy, we can do better.
     bool setProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
     bool setProperty(const CSSProperty&, CSSProperty* slot = 0);
 
     template<typename T> // CSSPropertyID or AtomicString
     bool removeProperty(T property, String* returnText = 0);
     bool removePropertiesInSet(const CSSPropertyID* set, unsigned length);
     void removeEquivalentProperties(const StylePropertySet*);
     void removeEquivalentProperties(const CSSStyleDeclaration*);
@@ skipping 13 matching lines @@
 private:
     explicit MutableStylePropertySet(CSSParserMode);
     explicit MutableStylePropertySet(const StylePropertySet&);
     MutableStylePropertySet(const CSSProperty* properties, unsigned count);
 
     bool removePropertyAtIndex(int, String* returnText);
 
     bool removeShorthandProperty(CSSPropertyID);
     bool removeShorthandProperty(const AtomicString& customPropertyName) { return false; }
     CSSProperty* findCSSPropertyWithID(CSSPropertyID, const AtomicString& customPropertyName = nullAtom);
-    OwnPtrWillBeMember<PropertySetCSSStyleDeclaration> m_cssomWrapper;
+    Member<PropertySetCSSStyleDeclaration> m_cssomWrapper;
 
     friend class StylePropertySet;
 
-    WillBeHeapVector<CSSProperty, 4> m_propertyVector;
+    HeapVector<CSSProperty, 4> m_propertyVector;
 };
 
 DEFINE_TYPE_CASTS(MutableStylePropertySet, StylePropertySet, set, set->isMutable(), set.isMutable());
 
-inline MutableStylePropertySet* toMutableStylePropertySet(const RefPtrWillBeRawPtr<StylePropertySet>& set)
+inline MutableStylePropertySet* toMutableStylePropertySet(const RawPtr<StylePropertySet>& set)
 {
     return toMutableStylePropertySet(set.get());
 }
 
 inline MutableStylePropertySet* toMutableStylePropertySet(const Persistent<StylePropertySet>& set)
 {
     return toMutableStylePropertySet(set.get());
 }
 
 inline MutableStylePropertySet* toMutableStylePropertySet(const Member<StylePropertySet>& set)
@@ skipping 44 matching lines @@
 inline int StylePropertySet::findPropertyIndex(T property) const
 {
     if (m_isMutable)
         return toMutableStylePropertySet(this)->findPropertyIndex(property);
     return toImmutableStylePropertySet(this)->findPropertyIndex(property);
 }
 
 } // namespace blink
 
 #endif // StylePropertySet_h