Merge 133052 - Web Inspector: frame chooser does not work on subsequent inspector open.

Source/WebCore/inspector/InspectorInstrumentation.cpp

Index: Source/WebCore/inspector/InspectorInstrumentation.cpp
===================================================================
--- Source/WebCore/inspector/InspectorInstrumentation.cpp	(revision 133600)
+++ Source/WebCore/inspector/InspectorInstrumentation.cpp	(working copy)
@@ -57,7 +57,6 @@
 #include "InspectorPageAgent.h"
 #include "InspectorProfilerAgent.h"
 #include "InspectorResourceAgent.h"
-#include "InspectorRuntimeAgent.h"
 #include "InspectorTimelineAgent.h"
 #include "InspectorWorkerAgent.h"
 #include "InstrumentingAgents.h"
@@ -67,6 +66,7 @@
 #include "ScriptProfile.h"
 #include "StyleRule.h"
 #include "WorkerContext.h"
+#include "WorkerRuntimeAgent.h"
 #include "WorkerThread.h"
 #include "XMLHttpRequest.h"
 #include <wtf/StdLibExtras.h>
@@ -127,7 +127,7 @@
 #endif
     if (PageRuntimeAgent* pageRuntimeAgent = instrumentingAgents->pageRuntimeAgent()) {
         if (world == mainThreadNormalWorld())
-            pageRuntimeAgent->didClearWindowObject(frame);
+            pageRuntimeAgent->didCreateMainWorldContext(frame);
     }
 }
 
@@ -1076,7 +1076,7 @@
     if (!instrumentingAgents)
         return;
 #if ENABLE(JAVASCRIPT_DEBUGGER)
-    if (InspectorRuntimeAgent* runtimeAgent = instrumentingAgents->inspectorRuntimeAgent())
+    if (WorkerRuntimeAgent* runtimeAgent = instrumentingAgents->workerRuntimeAgent())
         runtimeAgent->pauseWorkerContext(workerContext);
 #endif
 }
@@ -1164,13 +1164,6 @@
     return consoleAgent && consoleAgent->enabled();
 }
 
-bool InspectorInstrumentation::runtimeAgentEnabled(Frame* frame)
-{
-    InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame);
-    InspectorRuntimeAgent* runtimeAgent = instrumentingAgents ? instrumentingAgents->inspectorRuntimeAgent() : 0;
-    return runtimeAgent && runtimeAgent->enabled();
-}
-
 bool InspectorInstrumentation::timelineAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
 {
     InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);