Index: Source/core/inspector/PageRuntimeAgent.cpp |
diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp |
index eee729f089719f238f3d3695a7733b442b96a6ab..b640ea933a755e8a31636b9e05bd1ddb97a91cd1 100644 |
--- a/Source/core/inspector/PageRuntimeAgent.cpp |
+++ b/Source/core/inspector/PageRuntimeAgent.cpp |
@@ -32,7 +32,6 @@ |
#include "core/inspector/PageRuntimeAgent.h" |
#include "bindings/core/v8/DOMWrapperWorld.h" |
-#include "bindings/core/v8/MainThreadDebugger.h" |
#include "bindings/core/v8/ScriptController.h" |
#include "bindings/core/v8/ScriptState.h" |
#include "core/frame/FrameConsole.h" |
@@ -47,13 +46,10 @@ |
namespace blink { |
-static int s_nextDebuggerId = 1; |
- |
PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Client* client, V8Debugger* debugger, InspectorPageAgent* pageAgent) |
: InspectorRuntimeAgent(injectedScriptManager, debugger, client) |
, m_pageAgent(pageAgent) |
, m_mainWorldContextCreated(false) |
- , m_debuggerId(s_nextDebuggerId++) |
{ |
} |
@@ -102,15 +98,10 @@ void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
void PageRuntimeAgent::didCreateScriptContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin, int worldId) |
{ |
- bool isMainWorld = worldId == MainWorldId; |
- |
- // Name the context for debugging. |
- String type = isMainWorld ? "page" : "injected"; |
- MainThreadDebugger::setContextDebugData(scriptState->context(), type, m_debuggerId); |
- |
if (!m_enabled) |
pfeldman
2015/07/06 12:35:50
This agent no longer needs to be enabled at all ti
|
return; |
ASSERT(frontend()); |
+ bool isMainWorld = worldId == MainWorldId; |
String originString = origin ? origin->toRawString() : ""; |
String frameId = IdentifiersFactory::frameId(frame); |
addExecutionContextToFrontend(scriptState, isMainWorld, originString, frameId); |