| Index: third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.h
|
| diff --git a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.h b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.h
|
| index 230fbba7c56e4368ed4f28cbe741c6e032ba44b7..45f1e0c3482ab5957ce6c4afd2e1020a0337f980 100644
|
| --- a/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.h
|
| +++ b/third_party/WebKit/Source/core/dom/custom/CustomElementCallbackQueue.h
|
| @@ -44,11 +44,10 @@ namespace blink {
|
|
|
| // FIXME: Rename this because it contains resolution and upgrade as
|
| // well as callbacks.
|
| -class CustomElementCallbackQueue : public NoBaseWillBeGarbageCollectedFinalized<CustomElementCallbackQueue> {
|
| +class CustomElementCallbackQueue : public GarbageCollectedFinalized<CustomElementCallbackQueue> {
|
| WTF_MAKE_NONCOPYABLE(CustomElementCallbackQueue);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(CustomElementCallbackQueue);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<CustomElementCallbackQueue> create(PassRefPtrWillBeRawPtr<Element>);
|
| + static RawPtr<CustomElementCallbackQueue> create(RawPtr<Element>);
|
|
|
| typedef int ElementQueueId;
|
| ElementQueueId owner() const { return m_owner; }
|
| @@ -63,16 +62,16 @@ public:
|
|
|
| bool processInElementQueue(ElementQueueId);
|
|
|
| - void append(PassOwnPtrWillBeRawPtr<CustomElementProcessingStep> invocation) { m_queue.append(invocation); }
|
| + void append(RawPtr<CustomElementProcessingStep> invocation) { m_queue.append(invocation); }
|
| bool inCreatedCallback() const { return m_inCreatedCallback; }
|
|
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - explicit CustomElementCallbackQueue(PassRefPtrWillBeRawPtr<Element>);
|
| + explicit CustomElementCallbackQueue(RawPtr<Element>);
|
|
|
| - RefPtrWillBeMember<Element> m_element;
|
| - WillBeHeapVector<OwnPtrWillBeMember<CustomElementProcessingStep>> m_queue;
|
| + Member<Element> m_element;
|
| + HeapVector<Member<CustomElementProcessingStep>> m_queue;
|
| ElementQueueId m_owner;
|
| size_t m_index;
|
| bool m_inCreatedCallback;
|
|
|