| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 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 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/inspector/PageDebuggerAgent.h" | 32 #include "core/inspector/PageDebuggerAgent.h" |
| 33 | 33 |
| 34 #include "bindings/v8/DOMWrapperWorld.h" | 34 #include "bindings/v8/DOMWrapperWorld.h" |
| 35 #include "bindings/v8/PageScriptDebugServer.h" | 35 #include "bindings/v8/PageScriptDebugServer.h" |
| 36 #include "bindings/v8/ScriptController.h" |
| 36 #include "core/inspector/InspectorOverlay.h" | 37 #include "core/inspector/InspectorOverlay.h" |
| 37 #include "core/inspector/InspectorPageAgent.h" | 38 #include "core/inspector/InspectorPageAgent.h" |
| 38 #include "core/inspector/InstrumentingAgents.h" | 39 #include "core/inspector/InstrumentingAgents.h" |
| 40 #include "core/page/Frame.h" |
| 41 #include "core/page/Page.h" |
| 39 #include "core/page/PageConsole.h" | 42 #include "core/page/PageConsole.h" |
| 40 | 43 |
| 41 namespace WebCore { | 44 namespace WebCore { |
| 42 | 45 |
| 43 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* ins
trumentingAgents, InspectorCompositeState* inspectorState, InspectorPageAgent* p
ageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overla
y) | 46 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* ins
trumentingAgents, InspectorCompositeState* inspectorState, InspectorPageAgent* p
ageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overla
y) |
| 44 { | 47 { |
| 45 return adoptPtr(new PageDebuggerAgent(instrumentingAgents, inspectorState, p
ageAgent, injectedScriptManager, overlay)); | 48 return adoptPtr(new PageDebuggerAgent(instrumentingAgents, inspectorState, p
ageAgent, injectedScriptManager, overlay)); |
| 46 } | 49 } |
| 47 | 50 |
| 48 PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, I
nspectorCompositeState* inspectorState, InspectorPageAgent* pageAgent, InjectedS
criptManager* injectedScriptManager, InspectorOverlay* overlay) | 51 PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, I
nspectorCompositeState* inspectorState, InspectorPageAgent* pageAgent, InjectedS
criptManager* injectedScriptManager, InspectorOverlay* overlay) |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 { | 112 { |
| 110 m_overlay->setPausedInDebuggerMessage(message); | 113 m_overlay->setPausedInDebuggerMessage(message); |
| 111 } | 114 } |
| 112 | 115 |
| 113 void PageDebuggerAgent::didClearWindowObjectInWorld(Frame* frame, DOMWrapperWorl
d* world) | 116 void PageDebuggerAgent::didClearWindowObjectInWorld(Frame* frame, DOMWrapperWorl
d* world) |
| 114 { | 117 { |
| 115 if (world != mainThreadNormalWorld() || frame != m_pageAgent->mainFrame()) | 118 if (world != mainThreadNormalWorld() || frame != m_pageAgent->mainFrame()) |
| 116 return; | 119 return; |
| 117 | 120 |
| 118 reset(); | 121 reset(); |
| 119 scriptDebugServer().setScriptPreprocessor(m_pageAgent->scriptPreprocessor())
; | 122 frame->script()->setScriptPreprocessor(m_pageAgent->scriptPreprocessor()); |
| 120 } | 123 } |
| 121 | 124 |
| 122 } // namespace WebCore | 125 } // namespace WebCore |
| 123 | 126 |
| OLD | NEW |