| Index: third_party/WebKit/Source/core/html/imports/HTMLImportsController.h
|
| diff --git a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.h b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.h
|
| index 37c4e69060ee1559e0cad657d3bd1cbbd92cdb0e..e23614ac214b8f263c0307f927b6dd12402e138b 100644
|
| --- a/third_party/WebKit/Source/core/html/imports/HTMLImportsController.h
|
| +++ b/third_party/WebKit/Source/core/html/imports/HTMLImportsController.h
|
| @@ -46,9 +46,8 @@ class HTMLImportLoader;
|
| class HTMLImportTreeRoot;
|
| class KURL;
|
|
|
| -class HTMLImportsController final : public NoBaseWillBeGarbageCollectedFinalized<HTMLImportsController>, public WillBeHeapSupplement<Document> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLImportsController);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLImportsController);
|
| +class HTMLImportsController final : public GarbageCollectedFinalized<HTMLImportsController>, public HeapSupplement<Document> {
|
| + USING_GARBAGE_COLLECTED_MIXIN(HTMLImportsController);
|
| public:
|
| static const char* supplementName();
|
| static void provideTo(Document&);
|
| @@ -78,8 +77,8 @@ private:
|
|
|
| void dispose();
|
|
|
| - OwnPtrWillBeMember<HTMLImportTreeRoot> m_root;
|
| - using LoaderList = WillBeHeapVector<OwnPtrWillBeMember<HTMLImportLoader>>;
|
| + Member<HTMLImportTreeRoot> m_root;
|
| + using LoaderList = HeapVector<Member<HTMLImportLoader>>;
|
| LoaderList m_loaders;
|
| };
|
|
|
|
|