| Index: third_party/WebKit/Source/core/dom/ElementData.h
|
| diff --git a/third_party/WebKit/Source/core/dom/ElementData.h b/third_party/WebKit/Source/core/dom/ElementData.h
|
| index 63eab9b5b4a5ca1928a2c6d64b9b5f21849cb58a..5f3b8514ffd18a68e23b848209a73a92ae93fa4d 100644
|
| --- a/third_party/WebKit/Source/core/dom/ElementData.h
|
| +++ b/third_party/WebKit/Source/core/dom/ElementData.h
|
| @@ -46,8 +46,7 @@ class UniqueElementData;
|
|
|
| // ElementData represents very common, but not necessarily unique to an element,
|
| // data such as attributes, inline style, and parsed class names and ids.
|
| -class ElementData : public RefCountedWillBeGarbageCollectedFinalized<ElementData> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(ElementData);
|
| +class ElementData : public GarbageCollectedFinalized<ElementData> {
|
| public:
|
| #if ENABLE(OILPAN)
|
| // Override GarbageCollectedFinalized's finalizeGarbageCollectedObject to
|
| @@ -94,7 +93,7 @@ protected:
|
| mutable unsigned m_styleAttributeIsDirty : 1;
|
| mutable unsigned m_animatedSVGAttributesAreDirty : 1;
|
|
|
| - mutable RefPtrWillBeMember<StylePropertySet> m_inlineStyle;
|
| + mutable Member<StylePropertySet> m_inlineStyle;
|
| mutable SpaceSplitString m_classNames;
|
| mutable AtomicString m_idForStyleResolution;
|
|
|
| @@ -108,7 +107,7 @@ private:
|
| void destroy();
|
| #endif
|
|
|
| - PassRefPtrWillBeRawPtr<UniqueElementData> makeUniqueCopy() const;
|
| + RawPtr<UniqueElementData> makeUniqueCopy() const;
|
| };
|
|
|
| #define DEFINE_ELEMENT_DATA_TYPE_CASTS(thisType, pointerPredicate, referencePredicate) \
|
| @@ -126,7 +125,7 @@ private:
|
| // duplicate sets of attributes (ex. the same classes).
|
| class ShareableElementData final : public ElementData {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<ShareableElementData> createWithAttributes(const Vector<Attribute>&);
|
| + static RawPtr<ShareableElementData> createWithAttributes(const Vector<Attribute>&);
|
|
|
| explicit ShareableElementData(const Vector<Attribute>&);
|
| explicit ShareableElementData(const UniqueElementData&);
|
| @@ -163,8 +162,8 @@ DEFINE_ELEMENT_DATA_TYPE_CASTS(ShareableElementData, !data->isUnique(), !data.is
|
| // attribute will have the same inline style.
|
| class UniqueElementData final : public ElementData {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<UniqueElementData> create();
|
| - PassRefPtrWillBeRawPtr<ShareableElementData> makeShareableCopy() const;
|
| + static RawPtr<UniqueElementData> create();
|
| + RawPtr<ShareableElementData> makeShareableCopy() const;
|
|
|
| MutableAttributeCollection attributes();
|
| AttributeCollection attributes() const;
|
| @@ -179,7 +178,7 @@ public:
|
| // presentation attribute style. Lots of table cells likely have the same
|
| // attributes. Most modern pages don't use presentation attributes though
|
| // so this might not make sense.
|
| - mutable RefPtrWillBeMember<StylePropertySet> m_presentationAttributeStyle;
|
| + mutable Member<StylePropertySet> m_presentationAttributeStyle;
|
| AttributeVector m_attributeVector;
|
| };
|
|
|
|
|