| Index: third_party/WebKit/Source/core/dom/ElementData.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/ElementData.cpp b/third_party/WebKit/Source/core/dom/ElementData.cpp
|
| index 86a7f2e068917c9343f1439a695ef11a66d712cb..a090b0fc23ed09f318917e1604d230e9e1384d0e 100644
|
| --- a/third_party/WebKit/Source/core/dom/ElementData.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/ElementData.cpp
|
| @@ -36,9 +36,9 @@
|
|
|
| namespace blink {
|
|
|
| -struct SameSizeAsElementData : public RefCountedWillBeGarbageCollectedFinalized<SameSizeAsElementData> {
|
| +struct SameSizeAsElementData : public GarbageCollectedFinalized<SameSizeAsElementData> {
|
| unsigned bitfield;
|
| - RawPtrWillBeMember<void*> willbeMember;
|
| + Member<void*> willbeMember;
|
| void* pointers[2];
|
| };
|
|
|
| @@ -97,11 +97,11 @@ void ElementData::destroy()
|
| }
|
| #endif
|
|
|
| -PassRefPtrWillBeRawPtr<UniqueElementData> ElementData::makeUniqueCopy() const
|
| +RawPtr<UniqueElementData> ElementData::makeUniqueCopy() const
|
| {
|
| if (isUnique())
|
| - return adoptRefWillBeNoop(new UniqueElementData(toUniqueElementData(*this)));
|
| - return adoptRefWillBeNoop(new UniqueElementData(toShareableElementData(*this)));
|
| + return (new UniqueElementData(toUniqueElementData(*this)));
|
| + return (new UniqueElementData(toShareableElementData(*this)));
|
| }
|
|
|
| bool ElementData::isEquivalent(const ElementData* other) const
|
| @@ -161,14 +161,14 @@ ShareableElementData::ShareableElementData(const UniqueElementData& other)
|
| new (&m_attributeArray[i]) Attribute(other.m_attributeVector.at(i));
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<ShareableElementData> ShareableElementData::createWithAttributes(const Vector<Attribute>& attributes)
|
| +RawPtr<ShareableElementData> ShareableElementData::createWithAttributes(const Vector<Attribute>& attributes)
|
| {
|
| #if ENABLE(OILPAN)
|
| void* slot = Heap::allocate<ElementData>(sizeForShareableElementDataWithAttributeCount(attributes.size()));
|
| #else
|
| void* slot = WTF::Partitions::fastMalloc(sizeForShareableElementDataWithAttributeCount(attributes.size()), WTF_HEAP_PROFILER_TYPE_NAME(ShareableElementData));
|
| #endif
|
| - return adoptRefWillBeNoop(new (slot) ShareableElementData(attributes));
|
| + return (new (slot) ShareableElementData(attributes));
|
| }
|
|
|
| UniqueElementData::UniqueElementData()
|
| @@ -196,19 +196,19 @@ UniqueElementData::UniqueElementData(const ShareableElementData& other)
|
| m_attributeVector.uncheckedAppend(other.m_attributeArray[i]);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<UniqueElementData> UniqueElementData::create()
|
| +RawPtr<UniqueElementData> UniqueElementData::create()
|
| {
|
| - return adoptRefWillBeNoop(new UniqueElementData);
|
| + return (new UniqueElementData);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<ShareableElementData> UniqueElementData::makeShareableCopy() const
|
| +RawPtr<ShareableElementData> UniqueElementData::makeShareableCopy() const
|
| {
|
| #if ENABLE(OILPAN)
|
| void* slot = Heap::allocate<ElementData>(sizeForShareableElementDataWithAttributeCount(m_attributeVector.size()));
|
| #else
|
| void* slot = WTF::Partitions::fastMalloc(sizeForShareableElementDataWithAttributeCount(m_attributeVector.size()), WTF_HEAP_PROFILER_TYPE_NAME(ShareableElementData));
|
| #endif
|
| - return adoptRefWillBeNoop(new (slot) ShareableElementData(*this));
|
| + return (new (slot) ShareableElementData(*this));
|
| }
|
|
|
| DEFINE_TRACE_AFTER_DISPATCH(UniqueElementData)
|
|
|