Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: Source/core/inspector/PageRuntimeAgent.cpp

Issue 1225763002: Remove debugger id, use local frame id instead. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/PageRuntimeAgent.h ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "bindings/core/v8/DOMWrapperWorld.h" 34 #include "bindings/core/v8/DOMWrapperWorld.h"
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "bindings/core/v8/ScriptState.h" 36 #include "bindings/core/v8/ScriptState.h"
37 #include "core/frame/FrameConsole.h" 37 #include "core/frame/FrameConsole.h"
38 #include "core/frame/LocalFrame.h" 38 #include "core/frame/LocalFrame.h"
39 #include "core/inspector/IdentifiersFactory.h" 39 #include "core/inspector/IdentifiersFactory.h"
40 #include "core/inspector/InjectedScript.h" 40 #include "core/inspector/InjectedScript.h"
41 #include "core/inspector/InjectedScriptManager.h" 41 #include "core/inspector/InjectedScriptManager.h"
42 #include "core/inspector/InspectorPageAgent.h" 42 #include "core/inspector/InspectorPageAgent.h"
43 #include "core/inspector/InstrumentingAgents.h" 43 #include "core/inspector/InstrumentingAgents.h"
44 #include "core/inspector/MainThreadDebugger.h"
45 #include "core/page/Page.h" 44 #include "core/page/Page.h"
46 #include "platform/weborigin/SecurityOrigin.h" 45 #include "platform/weborigin/SecurityOrigin.h"
47 46
48 namespace blink { 47 namespace blink {
49 48
50 static int s_nextDebuggerId = 1;
51
52 PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Client* client, V8Debugger* debugger, InspectorPageAgent* pageAgent) 49 PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Client* client, V8Debugger* debugger, InspectorPageAgent* pageAgent)
53 : InspectorRuntimeAgent(injectedScriptManager, debugger, client) 50 : InspectorRuntimeAgent(injectedScriptManager, debugger, client)
54 , m_pageAgent(pageAgent) 51 , m_pageAgent(pageAgent)
55 , m_mainWorldContextCreated(false) 52 , m_mainWorldContextCreated(false)
56 , m_debuggerId(s_nextDebuggerId++)
57 { 53 {
58 } 54 }
59 55
60 PageRuntimeAgent::~PageRuntimeAgent() 56 PageRuntimeAgent::~PageRuntimeAgent()
61 { 57 {
62 #if !ENABLE(OILPAN) 58 #if !ENABLE(OILPAN)
63 m_instrumentingAgents->setPageRuntimeAgent(0); 59 m_instrumentingAgents->setPageRuntimeAgent(0);
64 #endif 60 #endif
65 } 61 }
66 62
(...skipping 28 matching lines...) Expand all
95 91
96 if (!m_enabled) 92 if (!m_enabled)
97 return; 93 return;
98 ASSERT(frontend()); 94 ASSERT(frontend());
99 95
100 frame->script().initializeMainWorld(); 96 frame->script().initializeMainWorld();
101 } 97 }
102 98
103 void PageRuntimeAgent::didCreateScriptContext(LocalFrame* frame, ScriptState* sc riptState, SecurityOrigin* origin, int worldId) 99 void PageRuntimeAgent::didCreateScriptContext(LocalFrame* frame, ScriptState* sc riptState, SecurityOrigin* origin, int worldId)
104 { 100 {
105 bool isMainWorld = worldId == MainWorldId;
106
107 // Name the context for debugging.
108 String type = isMainWorld ? "page" : "injected";
109 MainThreadDebugger::setContextDebugData(scriptState->context(), type, m_debu ggerId);
110
111 if (!m_enabled) 101 if (!m_enabled)
112 return; 102 return;
113 ASSERT(frontend()); 103 ASSERT(frontend());
104 bool isMainWorld = worldId == MainWorldId;
114 String originString = origin ? origin->toRawString() : ""; 105 String originString = origin ? origin->toRawString() : "";
115 String frameId = IdentifiersFactory::frameId(frame); 106 String frameId = IdentifiersFactory::frameId(frame);
116 addExecutionContextToFrontend(scriptState, isMainWorld, originString, frameI d); 107 addExecutionContextToFrontend(scriptState, isMainWorld, originString, frameI d);
117 } 108 }
118 109
119 void PageRuntimeAgent::willReleaseScriptContext(LocalFrame* frame, ScriptState* scriptState) 110 void PageRuntimeAgent::willReleaseScriptContext(LocalFrame* frame, ScriptState* scriptState)
120 { 111 {
121 injectedScriptManager()->discardInjectedScriptFor(scriptState); 112 injectedScriptManager()->discardInjectedScriptFor(scriptState);
122 ScriptStateToId::iterator it = m_scriptStateToId.find(scriptState); 113 ScriptStateToId::iterator it = m_scriptStateToId.find(scriptState);
123 if (it == m_scriptStateToId.end()) 114 if (it == m_scriptStateToId.end())
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 for (const auto& pair : isolatedContexts) { 164 for (const auto& pair : isolatedContexts) {
174 String originString = pair.second ? pair.second->toRawString() : ""; 165 String originString = pair.second ? pair.second->toRawString() : "";
175 addExecutionContextToFrontend(pair.first, false, originString, frame Id); 166 addExecutionContextToFrontend(pair.first, false, originString, frame Id);
176 } 167 }
177 isolatedContexts.clear(); 168 isolatedContexts.clear();
178 } 169 }
179 } 170 }
180 171
181 } // namespace blink 172 } // namespace blink
182 173
OLDNEW
« no previous file with comments | « Source/core/inspector/PageRuntimeAgent.h ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698