Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/svg/SVGElement.h

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2009, 2014 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.
  *
@@ skipping 32 matching lines @@
 class SVGCursorElement;
 class SVGDocumentExtensions;
 class SVGElement;
 class SVGElementRareData;
 class SVGFitToViewBox;
 class SVGLength;
 class SVGPropertyBase;
 class SVGSVGElement;
 class SVGUseElement;
 
-typedef WillBeHeapHashSet<RawPtrWillBeMember<SVGElement>> SVGElementSet;
+typedef HeapHashSet<Member<SVGElement>> SVGElementSet;
 
 class CORE_EXPORT SVGElement : public Element {
     DEFINE_WRAPPERTYPEINFO();
 public:
     ~SVGElement() override;
     void attach(const AttachContext&) override;
     void detach(const AttachContext&) override;
 
     short tabIndex() const override;
     bool supportsFocus() const override { return false; }
@@ skipping 16 matching lines @@
 
     bool instanceUpdatesBlocked() const;
     void setInstanceUpdatesBlocked(bool);
 
     // Records the SVG element as having a Web Animation on an SVG attribute that needs applying.
     void setWebAnimationsPending();
     void applyActiveWebAnimations();
 
     void ensureAttributeAnimValUpdated();
 
-    void setWebAnimatedAttribute(const QualifiedName& attribute, PassRefPtrWillBeRawPtr<SVGPropertyBase>);
+    void setWebAnimatedAttribute(const QualifiedName& attribute, RawPtr<SVGPropertyBase>);
     void clearWebAnimatedAttributes();
 
     SVGSVGElement* ownerSVGElement() const;
     SVGElement* viewportElement() const;
 
     SVGDocumentExtensions& accessDocumentSVGExtensions();
 
     virtual bool isSVGGeometryElement() const { return false; }
     virtual bool isSVGGraphicsElement() const { return false; }
     virtual bool isFilterEffect() const { return false; }
@@ skipping 11 matching lines @@
     static AnimatedPropertyType animatedPropertyTypeForCSSAttribute(const QualifiedName& attributeName);
 
     void sendSVGLoadEventToSelfAndAncestorChainIfPossible();
     bool sendSVGLoadEventIfPossible();
 
     virtual AffineTransform* animateMotionTransform() { return nullptr; }
 
     void invalidateSVGAttributes() { ensureUniqueElementData().m_animatedSVGAttributesAreDirty = true; }
     void invalidateSVGPresentationAttributeStyle() { ensureUniqueElementData().m_presentationAttributeStyleIsDirty = true; }
 
-    const WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement>>& instancesForElement() const;
+    const HeapHashSet<WeakMember<SVGElement>>& instancesForElement() const;
     void mapInstanceToElement(SVGElement*);
     void removeInstanceMapping(SVGElement*);
 
     void setCursorElement(SVGCursorElement*);
     void setCursorImageValue(CSSCursorImageValue*);
 
 #if !ENABLE(OILPAN)
     void cursorElementRemoved();
     void cursorImageValueRemoved();
 #endif
@@ skipping 11 matching lines @@
 #endif
 
     MutableStylePropertySet* animatedSMILStyleProperties() const;
     MutableStylePropertySet* ensureAnimatedSMILStyleProperties();
     void setUseOverrideComputedStyle(bool);
 
     virtual bool haveLoadedRequiredResources();
 
     void invalidateRelativeLengthClients(SubtreeLayoutScope* = 0);
 
-    void addToPropertyMap(PassRefPtrWillBeRawPtr<SVGAnimatedPropertyBase>);
+    void addToPropertyMap(RawPtr<SVGAnimatedPropertyBase>);
 
     SVGAnimatedString* className() { return m_className.get(); }
 
     bool inUseShadowTree() const;
 
     SVGElementSet* setOfIncomingReferences() const;
     void addReferenceTo(SVGElement*);
     void rebuildAllIncomingReferences();
     void removeAllIncomingReferences();
     void removeAllOutgoingReferences();
 
     class InvalidationGuard {
         STACK_ALLOCATED();
         WTF_MAKE_NONCOPYABLE(InvalidationGuard);
     public:
         InvalidationGuard(SVGElement* element) : m_element(element) { }
         ~InvalidationGuard() { m_element->invalidateInstances(); }
 
     private:
-        RawPtrWillBeMember<SVGElement> m_element;
+        Member<SVGElement> m_element;
     };
 
     class InstanceUpdateBlocker {
         STACK_ALLOCATED();
         WTF_MAKE_NONCOPYABLE(InstanceUpdateBlocker);
     public:
         InstanceUpdateBlocker(SVGElement* targetElement);
         ~InstanceUpdateBlocker();
 
     private:
-        RawPtrWillBeMember<SVGElement> m_targetElement;
+        Member<SVGElement> m_targetElement;
     };
 
     void invalidateInstances();
 
     DECLARE_VIRTUAL_TRACE();
 
     static const AtomicString& eventParameterName();
 
     bool isPresentationAttribute(const QualifiedName&) const override;
     virtual bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const { return false; }
@@ skipping 24 matching lines @@
     {
         ASSERT(m_SVGRareData);
         return m_SVGRareData.get();
     }
 
     // SVGFitToViewBox::parseAttribute uses reportAttributeParsingError.
     friend class SVGFitToViewBox;
     void reportAttributeParsingError(SVGParsingError, const QualifiedName&, const AtomicString&);
     bool hasFocusEventListeners() const;
 
-    bool addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, const EventListenerOptions&) final;
-    bool removeEventListenerInternal(const AtomicString& eventType, PassRefPtrWillBeRawPtr<EventListener>, const EventListenerOptions&) final;
+    bool addEventListenerInternal(const AtomicString& eventType, RawPtr<EventListener>, const EventListenerOptions&) final;
+    bool removeEventListenerInternal(const AtomicString& eventType, RawPtr<EventListener>, const EventListenerOptions&) final;
 
 private:
     bool isSVGElement() const = delete; // This will catch anyone doing an unnecessary check.
     bool isStyledElement() const = delete; // This will catch anyone doing an unnecessary check.
 
     const ComputedStyle* ensureComputedStyle(PseudoId = PseudoIdNone);
     const ComputedStyle* virtualEnsureComputedStyle(PseudoId pseudoElementSpecifier = PseudoIdNone) final { return ensureComputedStyle(pseudoElementSpecifier); }
     void willRecalcStyle(StyleRecalcChange) override;
 
     void buildPendingResourcesIfNeeded();
 
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<SVGElement>> m_elementsWithRelativeLengths;
+    HeapHashSet<WeakMember<SVGElement>> m_elementsWithRelativeLengths;
 
-    typedef WillBeHeapHashMap<QualifiedName, RefPtrWillBeMember<SVGAnimatedPropertyBase>> AttributeToPropertyMap;
+    typedef HeapHashMap<QualifiedName, Member<SVGAnimatedPropertyBase>> AttributeToPropertyMap;
     AttributeToPropertyMap m_attributeToPropertyMap;
 
 #if ENABLE(ASSERT)
     bool m_inRelativeLengthClientsInvalidation;
 #endif
 
-    OwnPtrWillBeMember<SVGElementRareData> m_SVGRareData;
-    RefPtrWillBeMember<SVGAnimatedString> m_className;
+    Member<SVGElementRareData> m_SVGRareData;
+    Member<SVGAnimatedString> m_className;
 };
 
 struct SVGAttributeHashTranslator {
     STATIC_ONLY(SVGAttributeHashTranslator);
     static unsigned hash(const QualifiedName& key)
     {
         if (key.hasPrefix()) {
             QualifiedNameComponents components = { nullAtom.impl(), key.localName().impl(), key.namespaceURI().impl() };
             return hashComponents(components);
         }
@@ skipping 12 matching lines @@
     return isSVGElement() && toSVGElement(*this).hasTagName(name);
 }
 
 // This requires isSVG*Element(const SVGElement&).
 #define DEFINE_SVGELEMENT_TYPE_CASTS_WITH_FUNCTION(thisType) \
     inline bool is##thisType(const thisType* element); \
     inline bool is##thisType(const thisType& element); \
     inline bool is##thisType(const SVGElement* element) { return element && is##thisType(*element); } \
     inline bool is##thisType(const Node& node) { return node.isSVGElement() ? is##thisType(toSVGElement(node)) : false; } \
     inline bool is##thisType(const Node* node) { return node && is##thisType(*node); } \
-    template<typename T> inline bool is##thisType(const PassRefPtrWillBeRawPtr<T>& node) { return is##thisType(node.get()); } \
-    template<typename T> inline bool is##thisType(const RefPtrWillBeMember<T>& node) { return is##thisType(node.get()); } \
+    template<typename T> inline bool is##thisType(const RawPtr<T>& node) { return is##thisType(node.get()); } \
+    template<typename T> inline bool is##thisType(const Member<T>& node) { return is##thisType(node.get()); } \
     template <> inline bool isElementOfType<const thisType>(const SVGElement& element) { return is##thisType(element); } \
     DEFINE_ELEMENT_TYPE_CASTS_WITH_FUNCTION(thisType)
 
 } // namespace blink
 
 #include "core/SVGElementTypeHelpers.h"
 
 #endif // SVGElement_h