Worklet: Separate Worklet into MainThreadWorklet and ThreadedWorklet

third_party/WebKit/Source/core/workers/Worklet.h

Index: third_party/WebKit/Source/core/workers/Worklet.h
diff --git a/third_party/WebKit/Source/core/workers/Worklet.h b/third_party/WebKit/Source/core/workers/Worklet.h
index 6d44e30f35ec4ee13538fe7897b701f07799c1ad..8ba8159f62a0a30e29ab67fe3f9dcc6f57b14c79 100644
--- a/third_party/WebKit/Source/core/workers/Worklet.h
+++ b/third_party/WebKit/Source/core/workers/Worklet.h
@@ -6,13 +6,10 @@
 #define Worklet_h
 
 #include "bindings/core/v8/ScriptPromise.h"
-#include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/dom/ContextLifecycleObserver.h"
-#include "core/loader/WorkletScriptLoader.h"
 #include "platform/heap/Handle.h"
-#include "platform/loader/fetch/ResourceFetcher.h"
 
 namespace blink {
 
@@ -20,7 +17,6 @@ class LocalFrame;
 class WorkletGlobalScopeProxy;
 

[falken, 2017/04/17 05:35:54]

nit: add a class-level comment?

[nhiroki, 2017/04/17 11:35:05]

Done.

 class CORE_EXPORT Worklet : public GarbageCollectedFinalized<Worklet>,
-                            public WorkletScriptLoader::Client,
                             public ScriptWrappable,
                             public ContextLifecycleObserver {
   DEFINE_WRAPPERTYPEINFO();
@@ -33,17 +29,11 @@ class CORE_EXPORT Worklet : public GarbageCollectedFinalized<Worklet>,
   virtual void Initialize() {}
   virtual bool IsInitialized() const { return true; }
 
+  virtual ScriptPromise import(ScriptState*, const String& url) = 0;
   virtual WorkletGlobalScopeProxy* GetWorkletGlobalScopeProxy() const = 0;

[falken, 2017/04/17 05:35:54]

Can you document this interface?

[nhiroki, 2017/04/17 11:35:05]

Done.

 
-  // Worklet
-  ScriptPromise import(ScriptState*, const String& url);
-
-  // WorkletScriptLoader::Client
-  void NotifyWorkletScriptLoadingFinished(WorkletScriptLoader*,
-                                          const ScriptSourceCode&) final;
-
   // ContextLifecycleObserver
-  void ContextDestroyed(ExecutionContext*) final;
+  virtual void ContextDestroyed(ExecutionContext*);
 
   DECLARE_VIRTUAL_TRACE();
 
@@ -51,10 +41,7 @@ class CORE_EXPORT Worklet : public GarbageCollectedFinalized<Worklet>,
   // The Worklet inherits the url and userAgent from the frame->document().
   explicit Worklet(LocalFrame*);
 
- private:
   Member<LocalFrame> frame_;
-  HeapHashMap<Member<WorkletScriptLoader>, Member<ScriptPromiseResolver>>
-      loader_and_resolvers_;
 };
 
 }  // namespace blink