[DevTools] Do not instrument with InspectorInspectorAgent.

Source/core/inspector/InspectorInstrumentation.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 19 matching lines @@
 
 #include "config.h"
 #include "core/inspector/InspectorInstrumentation.h"
 
 #include "core/events/EventTarget.h"
 #include "core/fetch/FetchInitiatorInfo.h"
 #include "core/frame/FrameHost.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorConsoleAgent.h"
 #include "core/inspector/InspectorDebuggerAgent.h"
-#include "core/inspector/InspectorInspectorAgent.h"
 #include "core/inspector/InspectorProfilerAgent.h"
 #include "core/inspector/InspectorResourceAgent.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/inspector/ScriptAsyncCallStack.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/page/Page.h"
 #include "core/workers/WorkerGlobalScope.h"
 
 namespace blink {
@@ skipping 51 matching lines @@
     didReceiveResourceResponseButCanceledImpl(frame, loader, identifier, r);
 }
 
 void continueWithPolicyIgnoreImpl(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
 {
     didReceiveResourceResponseButCanceledImpl(frame, loader, identifier, r);
 }
 
 void willDestroyResourceImpl(Resource* cachedResource)
 {
+    ASSERT(isMainThread());
     if (!instrumentingAgentsSet)
         return;
     for (InstrumentingAgents* instrumentingAgents: *instrumentingAgentsSet) {
         if (InspectorResourceAgent* inspectorResourceAgent = instrumentingAgents->inspectorResourceAgent())
             inspectorResourceAgent->willDestroyResource(cachedResource);
     }
 }
 
 bool collectingHTMLParseErrorsImpl(InstrumentingAgents* instrumentingAgents)
 {
-    if (InspectorInspectorAgent* inspectorAgent = instrumentingAgents->inspectorInspectorAgent())
-        return inspectorAgent->hasFrontend();
-    return false;
+    ASSERT(isMainThread());
+    if (!instrumentingAgentsSet)
+        return false;
+    return instrumentingAgentsSet->contains(instrumentingAgents);
 }
 
 void appendAsyncCallStack(ExecutionContext* executionContext, ScriptCallStack* callStack)
 {
     InstrumentingAgents* instrumentingAgents = instrumentingAgentsFor(executionContext);
     if (!instrumentingAgents)
         return;
     if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())
         callStack->setAsyncCallStack(debuggerAgent->currentAsyncStackTraceForConsole());
 }
 
 bool canvasAgentEnabled(ExecutionContext* executionContext)
 {
     InstrumentingAgents* instrumentingAgents = instrumentingAgentsFor(executionContext);
     return instrumentingAgents && instrumentingAgents->inspectorCanvasAgent();
 }
 
 bool consoleAgentEnabled(ExecutionContext* executionContext)
 {
     InstrumentingAgents* instrumentingAgents = instrumentingAgentsFor(executionContext);
     InspectorConsoleAgent* consoleAgent = instrumentingAgents ? instrumentingAgents->inspectorConsoleAgent() : 0;
     return consoleAgent && consoleAgent->enabled();
 }
 
 void registerInstrumentingAgents(InstrumentingAgents* instrumentingAgents)
 {
+    ASSERT(isMainThread());
     if (!instrumentingAgentsSet)
         instrumentingAgentsSet = new HashSet<InstrumentingAgents*>();
     instrumentingAgentsSet->add(instrumentingAgents);
 }
 
 void unregisterInstrumentingAgents(InstrumentingAgents* instrumentingAgents)
 {
+    ASSERT(isMainThread());
     if (!instrumentingAgentsSet)
         return;
     instrumentingAgentsSet->remove(instrumentingAgents);
     if (instrumentingAgentsSet->isEmpty()) {
         delete instrumentingAgentsSet;
         instrumentingAgentsSet = 0;
     }
 }
 
 InstrumentingAgents* instrumentingAgentsFor(LocalFrame* frame)
@@ skipping 50 matching lines @@
 
 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
     if (WorkerInspectorController* controller = workerGlobalScope->workerInspectorController())
         return controller->m_instrumentingAgents.get();
     return 0;
 }
 
 } // namespace blink