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

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

Issue 1866213002: [DevTools] Move inspect from Inspector to Runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@inspector-connection
Patch Set: inspectRequested Created 4 years, 8 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/platform/v8_inspector/public/V8RuntimeAgent.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 26 matching lines...) Expand all
37 #include "core/frame/Settings.h" 37 #include "core/frame/Settings.h"
38 #include "core/inspector/InspectedFrames.h" 38 #include "core/inspector/InspectedFrames.h"
39 #include "core/inspector/InspectorAnimationAgent.h" 39 #include "core/inspector/InspectorAnimationAgent.h"
40 #include "core/inspector/InspectorApplicationCacheAgent.h" 40 #include "core/inspector/InspectorApplicationCacheAgent.h"
41 #include "core/inspector/InspectorCSSAgent.h" 41 #include "core/inspector/InspectorCSSAgent.h"
42 #include "core/inspector/InspectorDOMAgent.h" 42 #include "core/inspector/InspectorDOMAgent.h"
43 #include "core/inspector/InspectorDOMDebuggerAgent.h" 43 #include "core/inspector/InspectorDOMDebuggerAgent.h"
44 #include "core/inspector/InspectorDebuggerAgent.h" 44 #include "core/inspector/InspectorDebuggerAgent.h"
45 #include "core/inspector/InspectorHeapProfilerAgent.h" 45 #include "core/inspector/InspectorHeapProfilerAgent.h"
46 #include "core/inspector/InspectorInputAgent.h" 46 #include "core/inspector/InspectorInputAgent.h"
47 #include "core/inspector/InspectorInspectorAgent.h"
48 #include "core/inspector/InspectorInstrumentation.h" 47 #include "core/inspector/InspectorInstrumentation.h"
49 #include "core/inspector/InspectorLayerTreeAgent.h" 48 #include "core/inspector/InspectorLayerTreeAgent.h"
50 #include "core/inspector/InspectorMemoryAgent.h" 49 #include "core/inspector/InspectorMemoryAgent.h"
51 #include "core/inspector/InspectorPageAgent.h" 50 #include "core/inspector/InspectorPageAgent.h"
52 #include "core/inspector/InspectorProfilerAgent.h" 51 #include "core/inspector/InspectorProfilerAgent.h"
53 #include "core/inspector/InspectorResourceAgent.h" 52 #include "core/inspector/InspectorResourceAgent.h"
54 #include "core/inspector/InspectorResourceContentLoader.h" 53 #include "core/inspector/InspectorResourceContentLoader.h"
55 #include "core/inspector/InspectorTaskRunner.h" 54 #include "core/inspector/InspectorTaskRunner.h"
56 #include "core/inspector/InspectorTracingAgent.h" 55 #include "core/inspector/InspectorTracingAgent.h"
57 #include "core/inspector/InspectorWorkerAgent.h" 56 #include "core/inspector/InspectorWorkerAgent.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 return; 388 return;
390 m_deferredAgentsInitialized = true; 389 m_deferredAgentsInitialized = true;
391 390
392 ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client); 391 ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client);
393 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); 392 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance();
394 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 393 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
395 394
396 m_v8Session = mainThreadDebugger->debugger()->connect(mainThreadDebugger->co ntextGroupId(m_inspectedFrames->root())); 395 m_v8Session = mainThreadDebugger->debugger()->connect(mainThreadDebugger->co ntextGroupId(m_inspectedFrames->root()));
397 V8RuntimeAgent* runtimeAgent = m_v8Session->runtimeAgent(); 396 V8RuntimeAgent* runtimeAgent = m_v8Session->runtimeAgent();
398 397
399 RawPtr<InspectorInspectorAgent> inspectorAgent = InspectorInspectorAgent::cr eate();
400 InspectorInspectorAgent* inspectorAgentPtr = inspectorAgent.get();
401 m_agents.append(inspectorAgent.release());
402
403 m_agents.append(PageRuntimeAgent::create(this, runtimeAgent, m_inspectedFram es.get())); 398 m_agents.append(PageRuntimeAgent::create(this, runtimeAgent, m_inspectedFram es.get()));
404 399
405 RawPtr<InspectorDOMAgent> domAgent = InspectorDOMAgent::create(isolate, m_in spectedFrames.get(), runtimeAgent, m_overlay.get()); 400 RawPtr<InspectorDOMAgent> domAgent = InspectorDOMAgent::create(isolate, m_in spectedFrames.get(), runtimeAgent, m_overlay.get());
406 m_domAgent = domAgent.get(); 401 m_domAgent = domAgent.get();
407 m_agents.append(domAgent.release()); 402 m_agents.append(domAgent.release());
408 403
409 RawPtr<InspectorLayerTreeAgent> layerTreeAgent = InspectorLayerTreeAgent::cr eate(m_inspectedFrames.get()); 404 RawPtr<InspectorLayerTreeAgent> layerTreeAgent = InspectorLayerTreeAgent::cr eate(m_inspectedFrames.get());
410 m_layerTreeAgent = layerTreeAgent.get(); 405 m_layerTreeAgent = layerTreeAgent.get();
411 m_agents.append(layerTreeAgent.release()); 406 m_agents.append(layerTreeAgent.release());
412 407
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 443
449 m_agents.append(InspectorProfilerAgent::create(m_v8Session->profilerAgent(), m_overlay.get())); 444 m_agents.append(InspectorProfilerAgent::create(m_v8Session->profilerAgent(), m_overlay.get()));
450 445
451 m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_v8Session->hea pProfilerAgent())); 446 m_agents.append(InspectorHeapProfilerAgent::create(isolate, m_v8Session->hea pProfilerAgent()));
452 447
453 RawPtr<InspectorPageAgent> pageAgent = InspectorPageAgent::create(m_inspecte dFrames.get(), this, m_resourceContentLoader.get(), debuggerAgentPtr); 448 RawPtr<InspectorPageAgent> pageAgent = InspectorPageAgent::create(m_inspecte dFrames.get(), this, m_resourceContentLoader.get(), debuggerAgentPtr);
454 m_pageAgent = pageAgent.get(); 449 m_pageAgent = pageAgent.get();
455 m_agents.append(pageAgent.release()); 450 m_agents.append(pageAgent.release());
456 451
457 runtimeAgent->setClearConsoleCallback(bind<>(&InspectorConsoleAgent::clearAl lMessages, pageConsoleAgentPtr)); 452 runtimeAgent->setClearConsoleCallback(bind<>(&InspectorConsoleAgent::clearAl lMessages, pageConsoleAgentPtr));
458 runtimeAgent->setInspectObjectCallback(bind<PassOwnPtr<protocol::Runtime::Re moteObject>, PassOwnPtr<protocol::DictionaryValue>>(&InspectorInspectorAgent::in spect, inspectorAgentPtr));
459 m_tracingAgent->setLayerTreeId(m_layerTreeId); 453 m_tracingAgent->setLayerTreeId(m_layerTreeId);
460 if (m_overlay) 454 if (m_overlay)
461 m_overlay->init(cssAgentPtr, debuggerAgentPtr, m_domAgent); 455 m_overlay->init(cssAgentPtr, debuggerAgentPtr, m_domAgent);
462 } 456 }
463 457
464 void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId) 458 void WebDevToolsAgentImpl::attach(const WebString& hostId, int sessionId)
465 { 459 {
466 if (m_attached) 460 if (m_attached)
467 return; 461 return;
468 462
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 if (!protocol::Dispatcher::getCommandName(message, &commandName)) 723 if (!protocol::Dispatcher::getCommandName(message, &commandName))
730 return false; 724 return false;
731 return commandName == "Debugger.pause" 725 return commandName == "Debugger.pause"
732 || commandName == "Debugger.setBreakpoint" 726 || commandName == "Debugger.setBreakpoint"
733 || commandName == "Debugger.setBreakpointByUrl" 727 || commandName == "Debugger.setBreakpointByUrl"
734 || commandName == "Debugger.removeBreakpoint" 728 || commandName == "Debugger.removeBreakpoint"
735 || commandName == "Debugger.setBreakpointsActive"; 729 || commandName == "Debugger.setBreakpointsActive";
736 } 730 }
737 731
738 } // namespace blink 732 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/v8_inspector/public/V8RuntimeAgent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698