Make ExecutionContext aware about how it can return CoreProbeSink

third_party/WebKit/Source/core/probe/CoreProbes.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorDOMDebuggerAgent.h"
 #include "core/inspector/InspectorNetworkAgent.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorSession.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/inspector/ThreadDebugger.h"
-#include "core/inspector/WorkerInspectorController.h"
 #include "core/page/Page.h"
-#include "core/workers/MainThreadWorkletGlobalScope.h"
 #include "core/workers/WorkerGlobalScope.h"
-#include "core/workers/WorkerThread.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/loader/fetch/FetchInitiatorInfo.h"
 
 namespace blink {
 namespace probe {
 
 AsyncTask::AsyncTask(ExecutionContext* context,
                      void* task,
                      const char* step,
                      bool enabled)
@@ skipping 73 matching lines @@
 }
 
 void ContinueWithPolicyIgnore(LocalFrame* frame,
                               DocumentLoader* loader,
                               unsigned long identifier,
                               const ResourceResponse& r,
                               Resource* resource) {
   DidReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource);
 }
 
-CoreProbeSink* ToCoreProbeSink(WorkerGlobalScope* worker_global_scope) {
-  if (!worker_global_scope)
-    return nullptr;
-  if (WorkerInspectorController* controller =
-          worker_global_scope->GetThread()->GetWorkerInspectorController())
-    return controller->InstrumentingAgents();
-  return nullptr;
-}
-
 CoreProbeSink* ToCoreProbeSinkForNonDocumentContext(ExecutionContext* context) {

[dgozman, 2017/04/28 00:06:38]

Why not replace ToCoreProbeSink in CoreProbes.h as well?


https://cs.chromium.org/chromium/src/third_party/WebKit/Source/core/probe/Cor...

[kinuko, 2017/04/28 03:16:26]

Done.

-  if (context->IsWorkerGlobalScope())
-    return ToCoreProbeSink(ToWorkerGlobalScope(context));
-  if (context->IsMainThreadWorkletGlobalScope())
-    return ToCoreProbeSink(ToMainThreadWorkletGlobalScope(context)->GetFrame());
-  return nullptr;
+  return context->GetInstrumentingAgents();
 }
 
 }  // namespace probe
 }  // namespace blink