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

Side by Side Diff: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp

Issue 1370373004: Revert of DevTools: extract V8DebuggerAgent interface, move it under .../inspector/v8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « third_party/WebKit/Source/web/WebDevToolsAgentImpl.h ('k') | no next file » | 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) 2010-2011 Google Inc. All rights reserved. 2 * Copyright (C) 2010-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 20 matching lines...) Expand all
31 #include "config.h" 31 #include "config.h"
32 #include "web/WebDevToolsAgentImpl.h" 32 #include "web/WebDevToolsAgentImpl.h"
33 33
34 #include "bindings/core/v8/ScriptController.h" 34 #include "bindings/core/v8/ScriptController.h"
35 #include "bindings/core/v8/V8Binding.h" 35 #include "bindings/core/v8/V8Binding.h"
36 #include "core/InspectorBackendDispatcher.h" 36 #include "core/InspectorBackendDispatcher.h"
37 #include "core/InspectorFrontend.h" 37 #include "core/InspectorFrontend.h"
38 #include "core/frame/FrameConsole.h" 38 #include "core/frame/FrameConsole.h"
39 #include "core/frame/LocalFrame.h" 39 #include "core/frame/LocalFrame.h"
40 #include "core/frame/Settings.h" 40 #include "core/frame/Settings.h"
41 #include "core/inspector/AsyncCallTracker.h"
41 #include "core/inspector/IdentifiersFactory.h" 42 #include "core/inspector/IdentifiersFactory.h"
42 #include "core/inspector/InjectedScriptHost.h" 43 #include "core/inspector/InjectedScriptHost.h"
43 #include "core/inspector/InjectedScriptManager.h" 44 #include "core/inspector/InjectedScriptManager.h"
44 #include "core/inspector/InspectorAnimationAgent.h" 45 #include "core/inspector/InspectorAnimationAgent.h"
45 #include "core/inspector/InspectorApplicationCacheAgent.h" 46 #include "core/inspector/InspectorApplicationCacheAgent.h"
46 #include "core/inspector/InspectorCSSAgent.h" 47 #include "core/inspector/InspectorCSSAgent.h"
47 #include "core/inspector/InspectorDOMAgent.h" 48 #include "core/inspector/InspectorDOMAgent.h"
48 #include "core/inspector/InspectorDOMDebuggerAgent.h" 49 #include "core/inspector/InspectorDOMDebuggerAgent.h"
49 #include "core/inspector/InspectorDebuggerAgent.h" 50 #include "core/inspector/InspectorDebuggerAgent.h"
50 #include "core/inspector/InspectorHeapProfilerAgent.h" 51 #include "core/inspector/InspectorHeapProfilerAgent.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 } 403 }
403 404
404 DEFINE_TRACE(WebDevToolsAgentImpl) 405 DEFINE_TRACE(WebDevToolsAgentImpl)
405 { 406 {
406 visitor->trace(m_webLocalFrameImpl); 407 visitor->trace(m_webLocalFrameImpl);
407 visitor->trace(m_instrumentingAgents); 408 visitor->trace(m_instrumentingAgents);
408 visitor->trace(m_injectedScriptManager); 409 visitor->trace(m_injectedScriptManager);
409 visitor->trace(m_resourceContentLoader); 410 visitor->trace(m_resourceContentLoader);
410 visitor->trace(m_state); 411 visitor->trace(m_state);
411 visitor->trace(m_overlay); 412 visitor->trace(m_overlay);
413 visitor->trace(m_asyncCallTracker);
412 visitor->trace(m_inspectorAgent); 414 visitor->trace(m_inspectorAgent);
413 visitor->trace(m_domAgent); 415 visitor->trace(m_domAgent);
414 visitor->trace(m_pageAgent); 416 visitor->trace(m_pageAgent);
415 visitor->trace(m_cssAgent); 417 visitor->trace(m_cssAgent);
416 visitor->trace(m_resourceAgent); 418 visitor->trace(m_resourceAgent);
417 visitor->trace(m_layerTreeAgent); 419 visitor->trace(m_layerTreeAgent);
418 visitor->trace(m_tracingAgent); 420 visitor->trace(m_tracingAgent);
419 visitor->trace(m_pageRuntimeAgent); 421 visitor->trace(m_pageRuntimeAgent);
420 visitor->trace(m_pageConsoleAgent); 422 visitor->trace(m_pageConsoleAgent);
421 visitor->trace(m_inspectorBackendDispatcher); 423 visitor->trace(m_inspectorBackendDispatcher);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 457
456 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent)); 458 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent));
457 459
458 m_agents.append(InspectorMemoryAgent::create()); 460 m_agents.append(InspectorMemoryAgent::create());
459 461
460 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); 462 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
461 463
462 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager)); 464 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager));
463 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); 465 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
464 m_agents.append(debuggerAgentPtr.release()); 466 m_agents.append(debuggerAgentPtr.release());
467 m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent-> v8DebuggerAgent(), m_instrumentingAgents.get()));
465 468
466 m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_d omAgent, debuggerAgent->v8DebuggerAgent())); 469 m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_d omAgent, debuggerAgent->v8DebuggerAgent()));
467 470
468 m_agents.append(InspectorInputAgent::create(m_pageAgent)); 471 m_agents.append(InspectorInputAgent::create(m_pageAgent));
469 472
470 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 473 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
471 m_agents.append(InspectorProfilerAgent::create(isolate, injectedScriptManage r, m_overlay.get())); 474 m_agents.append(InspectorProfilerAgent::create(isolate, injectedScriptManage r, m_overlay.get()));
472 475
473 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa nager)); 476 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa nager));
474 477
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 708 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
706 return false; 709 return false;
707 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 710 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
708 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 711 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
709 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 712 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
710 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 713 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
711 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 714 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
712 } 715 }
713 716
714 } // namespace blink 717 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebDevToolsAgentImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698