| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 | 367 |
| 368 m_session->append(InspectorInputAgent::create(m_inspectedFrames.get())); | 368 m_session->append(InspectorInputAgent::create(m_inspectedFrames.get())); |
| 369 | 369 |
| 370 InspectorPageAgent* pageAgent = InspectorPageAgent::create( | 370 InspectorPageAgent* pageAgent = InspectorPageAgent::create( |
| 371 m_inspectedFrames.get(), this, m_resourceContentLoader.get(), | 371 m_inspectedFrames.get(), this, m_resourceContentLoader.get(), |
| 372 m_session->v8Session()); | 372 m_session->v8Session()); |
| 373 m_pageAgent = pageAgent; | 373 m_pageAgent = pageAgent; |
| 374 m_session->append(pageAgent); | 374 m_session->append(pageAgent); |
| 375 | 375 |
| 376 m_session->append(new InspectorLogAgent( | 376 m_session->append(new InspectorLogAgent( |
| 377 &m_inspectedFrames->root()->host()->consoleMessageStorage(), | 377 &m_inspectedFrames->root()->page()->consoleMessageStorage(), |
| 378 m_inspectedFrames->root()->performanceMonitor())); | 378 m_inspectedFrames->root()->performanceMonitor())); |
| 379 | 379 |
| 380 m_session->append( | 380 m_session->append( |
| 381 new DeviceOrientationInspectorAgent(m_inspectedFrames.get())); | 381 new DeviceOrientationInspectorAgent(m_inspectedFrames.get())); |
| 382 | 382 |
| 383 m_tracingAgent->setLayerTreeId(m_layerTreeId); | 383 m_tracingAgent->setLayerTreeId(m_layerTreeId); |
| 384 m_networkAgent->setHostId(hostId); | 384 m_networkAgent->setHostId(hostId); |
| 385 | 385 |
| 386 if (m_includeViewAgents) { | 386 if (m_includeViewAgents) { |
| 387 // TODO(dgozman): we should actually pass the view instead of frame, but | 387 // TODO(dgozman): we should actually pass the view instead of frame, but |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 } | 652 } |
| 653 | 653 |
| 654 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) { | 654 bool WebDevToolsAgent::shouldInterruptForMethod(const WebString& method) { |
| 655 return method == "Debugger.pause" || method == "Debugger.setBreakpoint" || | 655 return method == "Debugger.pause" || method == "Debugger.setBreakpoint" || |
| 656 method == "Debugger.setBreakpointByUrl" || | 656 method == "Debugger.setBreakpointByUrl" || |
| 657 method == "Debugger.removeBreakpoint" || | 657 method == "Debugger.removeBreakpoint" || |
| 658 method == "Debugger.setBreakpointsActive"; | 658 method == "Debugger.setBreakpointsActive"; |
| 659 } | 659 } |
| 660 | 660 |
| 661 } // namespace blink | 661 } // namespace blink |
| OLD | NEW |