| OLD | NEW |
| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 | 377 |
| 378 void WebDevToolsAgentImpl::initializeSession(int sessionId, const String& hostId
) | 378 void WebDevToolsAgentImpl::initializeSession(int sessionId, const String& hostId
) |
| 379 { | 379 { |
| 380 m_session = new InspectorSession(this, m_inspectedFrames.get(), m_instrument
ingAgents.get(), sessionId, false /* autoFlush */); | 380 m_session = new InspectorSession(this, m_inspectedFrames.get(), m_instrument
ingAgents.get(), sessionId, false /* autoFlush */); |
| 381 | 381 |
| 382 ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client); | 382 ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client); |
| 383 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); | 383 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); |
| 384 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); | 384 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); |
| 385 m_v8Session = mainThreadDebugger->debugger()->connect(mainThreadDebugger->co
ntextGroupId(m_inspectedFrames->root())); | 385 m_v8Session = mainThreadDebugger->debugger()->connect(mainThreadDebugger->co
ntextGroupId(m_inspectedFrames->root())); |
| 386 | 386 |
| 387 m_session->append(PageRuntimeAgent::create(this, m_v8Session->runtimeAgent()
, m_inspectedFrames.get())); | 387 m_session->append(PageRuntimeAgent::create(m_v8Session->runtimeAgent(), m_in
spectedFrames.get())); |
| 388 | 388 |
| 389 InspectorDOMAgent* domAgent = new InspectorDOMAgent(isolate, m_inspectedFram
es.get(), m_v8Session.get(), m_overlay.get()); | 389 InspectorDOMAgent* domAgent = new InspectorDOMAgent(isolate, m_inspectedFram
es.get(), m_v8Session.get(), m_overlay.get()); |
| 390 m_domAgent = domAgent; | 390 m_domAgent = domAgent; |
| 391 m_session->append(domAgent); | 391 m_session->append(domAgent); |
| 392 | 392 |
| 393 InspectorLayerTreeAgent* layerTreeAgent = InspectorLayerTreeAgent::create(m_
inspectedFrames.get()); | 393 InspectorLayerTreeAgent* layerTreeAgent = InspectorLayerTreeAgent::create(m_
inspectedFrames.get()); |
| 394 m_layerTreeAgent = layerTreeAgent; | 394 m_layerTreeAgent = layerTreeAgent; |
| 395 m_session->append(layerTreeAgent); | 395 m_session->append(layerTreeAgent); |
| 396 | 396 |
| 397 InspectorResourceAgent* resourceAgent = InspectorResourceAgent::create(m_ins
pectedFrames.get()); | 397 InspectorResourceAgent* resourceAgent = InspectorResourceAgent::create(m_ins
pectedFrames.get()); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 419 m_session->append(workerAgent); | 419 m_session->append(workerAgent); |
| 420 | 420 |
| 421 InspectorTracingAgent* tracingAgent = InspectorTracingAgent::create(this, wo
rkerAgent, m_inspectedFrames.get()); | 421 InspectorTracingAgent* tracingAgent = InspectorTracingAgent::create(this, wo
rkerAgent, m_inspectedFrames.get()); |
| 422 m_tracingAgent = tracingAgent; | 422 m_tracingAgent = tracingAgent; |
| 423 m_session->append(tracingAgent); | 423 m_session->append(tracingAgent); |
| 424 | 424 |
| 425 m_session->append(new InspectorDOMDebuggerAgent(isolate, m_domAgent, m_v8Ses
sion.get())); | 425 m_session->append(new InspectorDOMDebuggerAgent(isolate, m_domAgent, m_v8Ses
sion.get())); |
| 426 | 426 |
| 427 m_session->append(InspectorInputAgent::create(m_inspectedFrames.get())); | 427 m_session->append(InspectorInputAgent::create(m_inspectedFrames.get())); |
| 428 | 428 |
| 429 m_session->append(InspectorProfilerAgent::create(m_v8Session->profilerAgent(
), m_overlay.get())); | 429 m_session->append(new InspectorProfilerAgent(m_v8Session->profilerAgent())); |
| 430 | 430 |
| 431 m_session->append(InspectorHeapProfilerAgent::create(m_v8Session->heapProfil
erAgent())); | 431 m_session->append(InspectorHeapProfilerAgent::create(m_v8Session->heapProfil
erAgent())); |
| 432 | 432 |
| 433 InspectorPageAgent* pageAgent = InspectorPageAgent::create(m_inspectedFrames
.get(), this, m_resourceContentLoader.get(), m_v8Session.get()); | 433 InspectorPageAgent* pageAgent = InspectorPageAgent::create(m_inspectedFrames
.get(), this, m_resourceContentLoader.get(), m_v8Session.get()); |
| 434 m_pageAgent = pageAgent; | 434 m_pageAgent = pageAgent; |
| 435 m_session->append(pageAgent); | 435 m_session->append(pageAgent); |
| 436 | 436 |
| 437 m_tracingAgent->setLayerTreeId(m_layerTreeId); | 437 m_tracingAgent->setLayerTreeId(m_layerTreeId); |
| 438 m_resourceAgent->setHostId(hostId); | 438 m_resourceAgent->setHostId(hostId); |
| 439 | 439 |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 | 604 |
| 605 void WebDevToolsAgentImpl::resumeStartup() | 605 void WebDevToolsAgentImpl::resumeStartup() |
| 606 { | 606 { |
| 607 // If we've paused for createWindow, handle it ourselves. | 607 // If we've paused for createWindow, handle it ourselves. |
| 608 if (ClientMessageLoopAdapter::resumeForCreateWindow()) | 608 if (ClientMessageLoopAdapter::resumeForCreateWindow()) |
| 609 return; | 609 return; |
| 610 // Otherwise, pass to the client (embedded workers do it differently). | 610 // Otherwise, pass to the client (embedded workers do it differently). |
| 611 m_client->resumeStartup(); | 611 m_client->resumeStartup(); |
| 612 } | 612 } |
| 613 | 613 |
| 614 void WebDevToolsAgentImpl::profilingStarted() |
| 615 { |
| 616 if (m_overlay) |
| 617 m_overlay->suspend(); |
| 618 } |
| 619 |
| 620 void WebDevToolsAgentImpl::profilingStopped() |
| 621 { |
| 622 if (m_overlay) |
| 623 m_overlay->resume(); |
| 624 } |
| 625 |
| 614 void WebDevToolsAgentImpl::pageLayoutInvalidated(bool resized) | 626 void WebDevToolsAgentImpl::pageLayoutInvalidated(bool resized) |
| 615 { | 627 { |
| 616 if (m_overlay) | 628 if (m_overlay) |
| 617 m_overlay->pageLayoutInvalidated(resized); | 629 m_overlay->pageLayoutInvalidated(resized); |
| 618 } | 630 } |
| 619 | 631 |
| 620 void WebDevToolsAgentImpl::setPausedInDebuggerMessage(const String& message) | 632 void WebDevToolsAgentImpl::setPausedInDebuggerMessage(const String& message) |
| 621 { | 633 { |
| 622 if (m_overlay) | 634 if (m_overlay) |
| 623 m_overlay->setPausedInDebuggerMessage(message); | 635 m_overlay->setPausedInDebuggerMessage(message); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) | 692 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) |
| 681 { | 693 { |
| 682 return method == "Debugger.pause" | 694 return method == "Debugger.pause" |
| 683 || method == "Debugger.setBreakpoint" | 695 || method == "Debugger.setBreakpoint" |
| 684 || method == "Debugger.setBreakpointByUrl" | 696 || method == "Debugger.setBreakpointByUrl" |
| 685 || method == "Debugger.removeBreakpoint" | 697 || method == "Debugger.removeBreakpoint" |
| 686 || method == "Debugger.setBreakpointsActive"; | 698 || method == "Debugger.setBreakpointsActive"; |
| 687 } | 699 } |
| 688 | 700 |
| 689 } // namespace blink | 701 } // namespace blink |
| OLD | NEW |