Simplify ownership handling of HTMLImportsController.

third_party/WebKit/Source/core/html/imports/HTMLImportsController.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 namespace blink {
 
 class FetchRequest;
 class HTMLImport;
 class HTMLImportChild;
 class HTMLImportChildClient;
 class HTMLImportLoader;
 class HTMLImportTreeRoot;
 class KURL;
 
-class HTMLImportsController final : public GarbageCollectedFinalized<HTMLImportsController>, public Supplement<Document> {
-    USING_GARBAGE_COLLECTED_MIXIN(HTMLImportsController);
+class HTMLImportsController final : public GarbageCollected<HTMLImportsController> {
 public:
-    static const char* supplementName();
-    static void provideTo(Document&);
-    static void removeFrom(Document&);
+    static HTMLImportsController* create(Document& master)
+    {
+        return new HTMLImportsController(master);
+    }
 
-    explicit HTMLImportsController(Document&);
-    virtual ~HTMLImportsController();
-
-    HTMLImportTreeRoot* root() const { return m_root.get(); }
+    HTMLImportTreeRoot* root() const { return m_root; }
 
     bool shouldBlockScriptExecution(const Document&) const;
     HTMLImportChild* load(HTMLImport* parent, HTMLImportChildClient*, FetchRequest);
 
     Document* master() const;
 
     HTMLImportLoader* createLoader();
 
     size_t loaderCount() const { return m_loaders.size(); }
-    HTMLImportLoader* loaderAt(size_t i) const { return m_loaders[i].get(); }
+    HTMLImportLoader* loaderAt(size_t i) const { return m_loaders[i]; }
     Document* loaderDocumentAt(size_t) const;
     HTMLImportLoader* loaderFor(const Document&) const;
 
-    DECLARE_VIRTUAL_TRACE();
-
-private:
-    HTMLImportChild* createChild(const KURL&, HTMLImportLoader*, HTMLImport* parent, HTMLImportChildClient*);
+    DECLARE_TRACE();
 
     void dispose();
 
+private:
+    explicit HTMLImportsController(Document&);
+
+    HTMLImportChild* createChild(const KURL&, HTMLImportLoader*, HTMLImport* parent, HTMLImportChildClient*);
+
     Member<HTMLImportTreeRoot> m_root;
     using LoaderList = HeapVector<Member<HTMLImportLoader>>;
     LoaderList m_loaders;
 };
 
 } // namespace blink
 
 #endif // HTMLImportsController_h