| Index: third_party/WebKit/Source/core/dom/NodeRareData.h
|
| diff --git a/third_party/WebKit/Source/core/dom/NodeRareData.h b/third_party/WebKit/Source/core/dom/NodeRareData.h
|
| index 4621a0c231360d0df485c54d70078bee5badff2a..8d59605857bebe66fb2c1d9103ffe3a127b328f8 100644
|
| --- a/third_party/WebKit/Source/core/dom/NodeRareData.h
|
| +++ b/third_party/WebKit/Source/core/dom/NodeRareData.h
|
| @@ -31,16 +31,15 @@
|
|
|
| namespace blink {
|
|
|
| -class NodeMutationObserverData final : public NoBaseWillBeGarbageCollected<NodeMutationObserverData> {
|
| +class NodeMutationObserverData final : public GarbageCollected<NodeMutationObserverData> {
|
| WTF_MAKE_NONCOPYABLE(NodeMutationObserverData);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(NodeMutationObserverData);
|
| public:
|
| - WillBeHeapVector<OwnPtrWillBeMember<MutationObserverRegistration>> registry;
|
| - WillBeHeapHashSet<RawPtrWillBeMember<MutationObserverRegistration>> transientRegistry;
|
| + HeapVector<Member<MutationObserverRegistration>> registry;
|
| + HeapHashSet<Member<MutationObserverRegistration>> transientRegistry;
|
|
|
| - static PassOwnPtrWillBeRawPtr<NodeMutationObserverData> create()
|
| + static RawPtr<NodeMutationObserverData> create()
|
| {
|
| - return adoptPtrWillBeNoop(new NodeMutationObserverData);
|
| + return (new NodeMutationObserverData);
|
| }
|
|
|
| DEFINE_INLINE_TRACE()
|
| @@ -55,9 +54,8 @@ private:
|
| NodeMutationObserverData() { }
|
| };
|
|
|
| -class NodeRareData : public NoBaseWillBeGarbageCollectedFinalized<NodeRareData>, public NodeRareDataBase {
|
| +class NodeRareData : public GarbageCollectedFinalized<NodeRareData>, public NodeRareDataBase {
|
| WTF_MAKE_NONCOPYABLE(NodeRareData);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(NodeRareData);
|
| public:
|
| static NodeRareData* create(LayoutObject* layoutObject)
|
| {
|
| @@ -118,8 +116,8 @@ protected:
|
| { }
|
|
|
| private:
|
| - OwnPtrWillBeMember<NodeListsNodeData> m_nodeLists;
|
| - OwnPtrWillBeMember<NodeMutationObserverData> m_mutationObserverData;
|
| + Member<NodeListsNodeData> m_nodeLists;
|
| + Member<NodeMutationObserverData> m_mutationObserverData;
|
|
|
| unsigned m_connectedFrameCount : ConnectedFrameCountBits;
|
| unsigned m_elementFlags : NumberOfElementFlags;
|
|
|