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..7409cfb886221b85f3be3edfcd1472b3a42ac14e 100644 |
--- a/third_party/WebKit/Source/modules/worklet/Worklet.h |
+++ b/third_party/WebKit/Source/modules/worklet/Worklet.h |
@@ -8,17 +8,17 @@ |
#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 ExecutionContext; |
-class ScriptPromiseResolver; |
-class WorkerScriptLoader; |
+class LocalFrame; |
+class Resource; |
+class ResourceFetcher; |
class WorkletGlobalScopeProxy; |
+class WorkletScriptLoader; |
class MODULES_EXPORT Worklet : public GarbageCollectedFinalized<Worklet>, public ScriptWrappable, public ActiveDOMObject { |
DEFINE_WRAPPERTYPEINFO(); |
@@ -30,22 +30,23 @@ public: |
// Worklet |
ScriptPromise import(ScriptState*, const String& url); |
+ void notifyFinished(Resource*); |
+ |
// ActiveDOMObject |
void stop() final; |
DECLARE_VIRTUAL_TRACE(); |
protected: |
- // The ExecutionContext argument is the parent document of the Worklet. The |
- // Worklet inherits the url and userAgent from the document. |
- explicit Worklet(ExecutionContext*); |
+ // The Worklet inherits the url and userAgent from the frame->document(). |
+ explicit Worklet(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; |
yhirano
2016/08/01 10:56:28
It seems having m_resources is not necessary if we
Gleb Lanbin
2016/08/01 19:49:51
Done.
|
+ HeapVector<Member<WorkletScriptLoader>> m_scriptLoaders; |
}; |
} // namespace blink |