| Index: Source/core/inspector/InspectorInstrumentation.cpp
|
| diff --git a/Source/core/inspector/InspectorInstrumentation.cpp b/Source/core/inspector/InspectorInstrumentation.cpp
|
| index ccc9b2800731f0053f027e7a95542f28f325ab59..4029db903331a586f9b287da8479a64df5113755 100644
|
| --- a/Source/core/inspector/InspectorInstrumentation.cpp
|
| +++ b/Source/core/inspector/InspectorInstrumentation.cpp
|
| @@ -195,11 +195,9 @@ InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCook
|
| return 0;
|
| }
|
|
|
| -InstrumentingAgents* instrumentingAgentsFor(Page* page)
|
| +InstrumentingAgents* instrumentingAgentsFor(LocalFrame* frame)
|
| {
|
| - if (!page)
|
| - return 0;
|
| - return instrumentationForPage(page);
|
| + return frame ? frame->instrumentingAgents() : nullptr;
|
| }
|
|
|
| InstrumentingAgents* instrumentingAgentsFor(EventTarget* eventTarget)
|
| @@ -221,11 +219,6 @@ InstrumentingAgents* instrumentingAgentsFor(WorkerGlobalScope* workerGlobalScope
|
| return instrumentationForWorkerGlobalScope(workerGlobalScope);
|
| }
|
|
|
| -InstrumentingAgents* instrumentingAgentsFor(FrameHost* host)
|
| -{
|
| - return instrumentationForPage(&host->page());
|
| -}
|
| -
|
| InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ExecutionContext* context)
|
| {
|
| if (context->isWorkerGlobalScope())
|
| @@ -254,12 +247,6 @@ const char PageId[] = "pageId";
|
| const char CallbackName[] = "callbackName";
|
| };
|
|
|
| -InstrumentingAgents* instrumentationForPage(Page* page)
|
| -{
|
| - ASSERT(isMainThread());
|
| - return page->inspectorController().m_instrumentingAgents.get();
|
| -}
|
| -
|
| InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
|
| {
|
| if (WorkerInspectorController* controller = workerGlobalScope->workerInspectorController())
|
|
|