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

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

Issue 1286343003: DevTools: make InspectorDebuggerAgent aggregate V8DebuggerAgent instead of inheriting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed dgozman's comments Created 5 years, 4 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 | « Source/core/inspector/WorkerInspectorController.cpp ('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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent)); 456 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent));
457 457
458 m_agents.append(InspectorMemoryAgent::create()); 458 m_agents.append(InspectorMemoryAgent::create());
459 459
460 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); 460 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
461 461
462 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay)); 462 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay));
463 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); 463 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get();
464 m_agents.append(debuggerAgentPtr.release()); 464 m_agents.append(debuggerAgentPtr.release());
465 m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent, m_instrumentingAgents.get())); 465 m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(debuggerAgent-> v8DebuggerAgent(), m_instrumentingAgents.get()));
466 466
467 m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_d omAgent, debuggerAgent)); 467 m_agents.append(InspectorDOMDebuggerAgent::create(injectedScriptManager, m_d omAgent, debuggerAgent->v8DebuggerAgent()));
468 468
469 m_agents.append(InspectorInputAgent::create(m_pageAgent)); 469 m_agents.append(InspectorInputAgent::create(m_pageAgent));
470 470
471 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 471 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
472 m_agents.append(InspectorProfilerAgent::create(isolate, injectedScriptManage r, m_overlay)); 472 m_agents.append(InspectorProfilerAgent::create(isolate, injectedScriptManage r, m_overlay));
473 473
474 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa nager)); 474 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa nager));
475 475
476 m_pageAgent->setDebuggerAgent(debuggerAgent); 476 m_pageAgent->setDebuggerAgent(debuggerAgent);
477 m_pageConsoleAgent->setDebuggerAgent(debuggerAgent); 477 m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8DebuggerAgent());
478 478
479 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); 479 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance();
480 m_injectedScriptManager->injectedScriptHost()->init( 480 m_injectedScriptManager->injectedScriptHost()->init(
481 m_pageConsoleAgent.get(), 481 m_pageConsoleAgent.get(),
482 debuggerAgent, 482 debuggerAgent->v8DebuggerAgent(),
483 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()), 483 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()),
484 mainThreadDebugger->debugger(), 484 mainThreadDebugger->debugger(),
485 adoptPtr(new PageInjectedScriptHostClient())); 485 adoptPtr(new PageInjectedScriptHostClient()));
486 } 486 }
487 487
488 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent) 488 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
489 { 489 {
490 m_agents.append(agent); 490 m_agents.append(agent);
491 } 491 }
492 492
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) 754 if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
755 return false; 755 return false;
756 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) 756 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd)
757 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) 757 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd)
758 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) 758 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd)
759 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) 759 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd)
760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd);
761 } 761 }
762 762
763 } // namespace blink 763 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/WorkerInspectorController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698