Refactor Worklet class to use ScriptResource

third_party/WebKit/Source/modules/worklet/Worklet.h

Index: third_party/WebKit/Source/modules/worklet/Worklet.h
diff --git a/third_party/WebKit/Source/modules/worklet/Worklet.h b/third_party/WebKit/Source/modules/worklet/Worklet.h
index 620cb77354fa95bcc6742242bdb8862d507b46c8..55ecf9c89e68f584e3f3f4e54d26f3a061b6026f 100644
--- a/third_party/WebKit/Source/modules/worklet/Worklet.h
+++ b/third_party/WebKit/Source/modules/worklet/Worklet.h
@@ -8,16 +8,15 @@
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
-#include "core/frame/csp/ContentSecurityPolicy.h"
-#include "core/workers/WorkerScriptLoader.h"
+#include "core/fetch/ScriptResource.h"
 #include "modules/ModulesExport.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
+class LocalFrame;
 class ExecutionContext;

[yhirano, 2016/07/29 02:19:23]

+class Resource;

[Gleb Lanbin, 2016/07/29 19:23:14]

Done.

-class ScriptPromiseResolver;
-class WorkerScriptLoader;
+class ResourceFetcher;
 class WorkletGlobalScopeProxy;
 
 class MODULES_EXPORT Worklet : public GarbageCollectedFinalized<Worklet>, public ScriptWrappable, public ActiveDOMObject {
@@ -30,6 +29,8 @@ public:
     // Worklet
     ScriptPromise import(ScriptState*, const String& url);
 
+    void notifyFinished(Resource*);
+
     // ActiveDOMObject
     void stop() final;
 
@@ -38,14 +39,13 @@ public:
 protected:
     // The ExecutionContext argument is the parent document of the Worklet. The
     // Worklet inherits the url and userAgent from the document.
-    explicit Worklet(ExecutionContext*);
+    explicit Worklet(ExecutionContext*, LocalFrame*);
 
 private:
-    void onResponse(WorkerScriptLoader*);
-    void onFinished(WorkerScriptLoader*, ScriptPromiseResolver*);
+    ResourceFetcher* fetcher() const { return m_fetcher.get(); }
 
-    Vector<RefPtr<WorkerScriptLoader>> m_scriptLoaders;
-    HeapVector<Member<ScriptPromiseResolver>> m_resolvers;
+    Member<ResourceFetcher> m_fetcher;
+    HeapVector<Member<Resource>> m_resources;
 };
 
 } // namespace blink