| Index: third_party/WebKit/Source/core/html/imports/HTMLImportLoader.h
|
| diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.h b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.h
|
| index 1351f2dc1f1ffeb9c2b88ab0cd45f470c24c1fec..cdeee8cadc06d8dd3100e723c42a3812d72518dc 100644
|
| --- a/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.h
|
| +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportLoader.h
|
| @@ -54,9 +54,8 @@ class HTMLImportsController;
|
| // HTMLImportLoader is owned by HTMLImportsController.
|
| //
|
| //
|
| -class HTMLImportLoader final : public NoBaseWillBeGarbageCollectedFinalized<HTMLImportLoader>, public ResourceOwner<RawResource>, public DocumentParserClient {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLImportLoader);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLImportLoader);
|
| +class HTMLImportLoader final : public GarbageCollectedFinalized<HTMLImportLoader>, public ResourceOwner<RawResource>, public DocumentParserClient {
|
| + USING_GARBAGE_COLLECTED_MIXIN(HTMLImportLoader);
|
| public:
|
| enum State {
|
| StateLoading,
|
| @@ -66,9 +65,9 @@ public:
|
| StateError
|
| };
|
|
|
| - static PassOwnPtrWillBeRawPtr<HTMLImportLoader> create(HTMLImportsController* controller)
|
| + static RawPtr<HTMLImportLoader> create(HTMLImportsController* controller)
|
| {
|
| - return adoptPtrWillBeNoop(new HTMLImportLoader(controller));
|
| + return new HTMLImportLoader(controller);
|
| }
|
|
|
| ~HTMLImportLoader() override;
|
| @@ -86,14 +85,14 @@ public:
|
| bool hasError() const { return m_state == StateError; }
|
| bool shouldBlockScriptExecution() const;
|
|
|
| - void startLoading(const PassRefPtrWillBeRawPtr<RawResource>&);
|
| + void startLoading(const RawPtr<RawResource>&);
|
|
|
| // Tells the loader that all of the import's stylesheets finished
|
| // loading.
|
| // Called by Document::didRemoveAllPendingStylesheet.
|
| void didRemoveAllPendingStylesheet();
|
|
|
| - PassRefPtrWillBeRawPtr<CustomElementSyncMicrotaskQueue> microtaskQueue() const;
|
| + RawPtr<CustomElementSyncMicrotaskQueue> microtaskQueue() const;
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -123,12 +122,12 @@ private:
|
| void clear();
|
| #endif
|
|
|
| - RawPtrWillBeMember<HTMLImportsController> m_controller;
|
| - WillBeHeapVector<RawPtrWillBeMember<HTMLImportChild>> m_imports;
|
| + Member<HTMLImportsController> m_controller;
|
| + HeapVector<Member<HTMLImportChild>> m_imports;
|
| State m_state;
|
| - RefPtrWillBeMember<Document> m_document;
|
| - RefPtrWillBeMember<DocumentWriter> m_writer;
|
| - RefPtrWillBeMember<CustomElementSyncMicrotaskQueue> m_microtaskQueue;
|
| + Member<Document> m_document;
|
| + Member<DocumentWriter> m_writer;
|
| + Member<CustomElementSyncMicrotaskQueue> m_microtaskQueue;
|
| };
|
|
|
| } // namespace blink
|
|
|