Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(897)

Unified Diff: third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp

Issue 2116113002: [worklets] Make WorkerThread handle both Worker and Worklet global scopes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
index 2cc2908c3a01b1594fc12eff2b404d9d249bfb51..76eb2205278aaf3ccc543c450f393efede265e24 100644
--- a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
@@ -10,6 +10,7 @@
#include "core/inspector/InspectorInstrumentation.h"
#include "core/inspector/InspectorTraceEvents.h"
#include "core/inspector/WorkerInspectorController.h"
+#include "core/workers/WorkerGlobalScope.h"
#include "core/workers/WorkerThread.h"
#include "platform/TraceEvent.h"
#include "platform/weborigin/KURL.h"
@@ -101,8 +102,11 @@ void WorkerInspectorProxy::addConsoleMessageFromWorker(ConsoleMessage* consoleMe
static void connectToWorkerGlobalScopeInspectorTask(WorkerThread* workerThread)
{
- if (WorkerInspectorController* inspector = workerThread->workerGlobalScope()->workerInspectorController())
- inspector->connectFrontend();
+ WorkerOrWorkletGlobalScope* globalScope = workerThread->globalScope();
+ if (globalScope->isWorkerGlobalScope()) {
+ if (WorkerInspectorController* inspector = toWorkerGlobalScope(globalScope)->workerInspectorController())
+ inspector->connectFrontend();
+ }
}
void WorkerInspectorProxy::connectToInspector(WorkerInspectorProxy::PageInspector* pageInspector)
@@ -116,8 +120,11 @@ void WorkerInspectorProxy::connectToInspector(WorkerInspectorProxy::PageInspecto
static void disconnectFromWorkerGlobalScopeInspectorTask(WorkerThread* workerThread)
{
- if (WorkerInspectorController* inspector = workerThread->workerGlobalScope()->workerInspectorController())
- inspector->disconnectFrontend();
+ WorkerOrWorkletGlobalScope* globalScope = workerThread->globalScope();
+ if (globalScope->isWorkerGlobalScope()) {
+ if (WorkerInspectorController* inspector = toWorkerGlobalScope(globalScope)->workerInspectorController())
+ inspector->disconnectFrontend();
+ }
}
void WorkerInspectorProxy::disconnectFromInspector(WorkerInspectorProxy::PageInspector* pageInspector)
@@ -130,8 +137,11 @@ void WorkerInspectorProxy::disconnectFromInspector(WorkerInspectorProxy::PageIns
static void dispatchOnInspectorBackendTask(const String& message, WorkerThread* workerThread)
{
- if (WorkerInspectorController* inspector = workerThread->workerGlobalScope()->workerInspectorController())
- inspector->dispatchMessageFromFrontend(message);
+ WorkerOrWorkletGlobalScope* globalScope = workerThread->globalScope();
+ if (globalScope->isWorkerGlobalScope()) {
+ if (WorkerInspectorController* inspector = toWorkerGlobalScope(globalScope)->workerInspectorController())
+ inspector->dispatchMessageFromFrontend(message);
+ }
}
void WorkerInspectorProxy::sendMessageToInspector(const String& message)

Powered by Google App Engine
This is Rietveld 408576698