Worklet: Enable TaskRunnerHelper to handle MainThreadWorkletGlobalScope

third_party/WebKit/Source/core/dom/TaskRunnerHelper.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/TaskRunnerHelper.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
+#include "core/workers/MainThreadWorkletGlobalScope.h"
 #include "core/workers/WorkerOrWorkletGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/WebFrameScheduler.h"
 #include "platform/WebTaskRunner.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 
 namespace blink {
 
 RefPtr<WebTaskRunner> TaskRunnerHelper::Get(TaskType type, LocalFrame* frame) {
@@ skipping 39 matching lines @@
   NOTREACHED();
   return nullptr;
 }
 
 RefPtr<WebTaskRunner> TaskRunnerHelper::Get(TaskType type, Document* document) {
   return Get(type, document ? document->GetFrame() : nullptr);
 }
 
 RefPtr<WebTaskRunner> TaskRunnerHelper::Get(
     TaskType type,
-    ExecutionContext* executionContext) {
-  if (!executionContext)
-    return Get(type, ToDocument(executionContext));
-  if (executionContext->IsDocument())
-    return Get(type, ToDocument(executionContext));
-  if (executionContext->IsWorkerOrWorkletGlobalScope())
-    return Get(type, ToWorkerOrWorkletGlobalScope(executionContext));
-  executionContext = nullptr;
-  return Get(type, ToDocument(executionContext));
+    ExecutionContext* execution_context) {
+  if (!execution_context)
+    return Get(type, ToDocument(execution_context));
+  if (execution_context->IsDocument())
+    return Get(type, ToDocument(execution_context));
+  if (execution_context->IsMainThreadWorkletGlobalScope()) {
+    return Get(type,
+               ToMainThreadWorkletGlobalScope(execution_context)->GetFrame());
+  }
+  if (execution_context->IsWorkerOrWorkletGlobalScope())
+    return Get(type, ToWorkerOrWorkletGlobalScope(execution_context));
+  execution_context = nullptr;
+  return Get(type, ToDocument(execution_context));

[kinuko (google), 2017/05/10 01:04:46]

would Get(type, ToDocument(nullptr)) work?

actually what we want to call in this case is frame version of Get, is that
right?

[nhiroki, 2017/05/10 01:15:41]

I tried it before but the compiler complained:
https://codereview.chromium.org/2806623004/diff/300001/third_party/WebKit/Sou...
Yes, that's right. Do you prefer ToLocalFrame()?

 }
 
 RefPtr<WebTaskRunner> TaskRunnerHelper::Get(TaskType type,
                                             ScriptState* script_state) {
   return Get(type,
              script_state ? ExecutionContext::From(script_state) : nullptr);
 }
 
 RefPtr<WebTaskRunner> TaskRunnerHelper::Get(
     TaskType type,
@@ skipping 33 matching lines @@
       // TODO(nhiroki): Identify which tasks can be throttled / suspendable and
       // move them into other task runners. See also comments in
       // Get(LocalFrame). (https://crbug.com/670534)
       return worker_thread->GetGlobalScopeScheduler()->UnthrottledTaskRunner();
   }
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace blink