| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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/core/v8/DOMWrapperWorld.h" | 34 #include "sky/engine/bindings/core/v8/DOMWrapperWorld.h" |
| 35 #include "bindings/core/v8/ScriptController.h" | 35 #include "sky/engine/bindings/core/v8/ScriptController.h" |
| 36 #include "bindings/core/v8/ScriptSourceCode.h" | 36 #include "sky/engine/bindings/core/v8/ScriptSourceCode.h" |
| 37 #include "core/frame/FrameConsole.h" | 37 #include "sky/engine/core/frame/FrameConsole.h" |
| 38 #include "core/frame/LocalFrame.h" | 38 #include "sky/engine/core/frame/LocalFrame.h" |
| 39 #include "core/page/Page.h" | 39 #include "sky/engine/core/page/Page.h" |
| 40 #include "sky/engine/v8_inspector/inspector_host.h" |
| 40 | 41 |
| 41 namespace blink { | 42 namespace blink { |
| 42 | 43 |
| 43 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* p
ageScriptDebugServer, Page* page, InjectedScriptManager* injectedScriptManager) | 44 PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(PageScriptDebugServer* p
ageScriptDebugServer, inspector::InspectorHost* host, InjectedScriptManager* inj
ectedScriptManager) |
| 44 { | 45 { |
| 45 return adoptPtr(new PageDebuggerAgent(pageScriptDebugServer, page, injectedS
criptManager)); | 46 return adoptPtr(new PageDebuggerAgent(pageScriptDebugServer, host, injectedS
criptManager)); |
| 46 } | 47 } |
| 47 | 48 |
| 48 PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServe
r, Page* page, InjectedScriptManager* injectedScriptManager) | 49 PageDebuggerAgent::PageDebuggerAgent(PageScriptDebugServer* pageScriptDebugServe
r, inspector::InspectorHost* host, InjectedScriptManager* injectedScriptManager) |
| 49 : InspectorDebuggerAgent(injectedScriptManager) | 50 : InspectorDebuggerAgent(injectedScriptManager) |
| 50 , m_pageScriptDebugServer(pageScriptDebugServer) | 51 , m_pageScriptDebugServer(pageScriptDebugServer) |
| 51 , m_page(page) | 52 , m_host(host) |
| 52 { | 53 { |
| 53 } | 54 } |
| 54 | 55 |
| 55 PageDebuggerAgent::~PageDebuggerAgent() | 56 PageDebuggerAgent::~PageDebuggerAgent() |
| 56 { | 57 { |
| 57 } | 58 } |
| 58 | 59 |
| 59 void PageDebuggerAgent::startListeningScriptDebugServer() | 60 void PageDebuggerAgent::startListeningScriptDebugServer() |
| 60 { | 61 { |
| 61 scriptDebugServer().addListener(this, m_page); | 62 scriptDebugServer().addListener(this, m_host); |
| 62 } | 63 } |
| 63 | 64 |
| 64 void PageDebuggerAgent::stopListeningScriptDebugServer() | 65 void PageDebuggerAgent::stopListeningScriptDebugServer() |
| 65 { | 66 { |
| 66 scriptDebugServer().removeListener(this, m_page); | 67 scriptDebugServer().removeListener(this, m_host); |
| 67 } | 68 } |
| 68 | 69 |
| 69 PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer() | 70 PageScriptDebugServer& PageDebuggerAgent::scriptDebugServer() |
| 70 { | 71 { |
| 71 return *m_pageScriptDebugServer; | 72 return *m_pageScriptDebugServer; |
| 72 } | 73 } |
| 73 | 74 |
| 74 void PageDebuggerAgent::muteConsole() | 75 void PageDebuggerAgent::muteConsole() |
| 75 { | 76 { |
| 76 FrameConsole::mute(); | 77 FrameConsole::mute(); |
| 77 } | 78 } |
| 78 | 79 |
| 79 void PageDebuggerAgent::unmuteConsole() | 80 void PageDebuggerAgent::unmuteConsole() |
| 80 { | 81 { |
| 81 FrameConsole::unmute(); | 82 FrameConsole::unmute(); |
| 82 } | 83 } |
| 83 | 84 |
| 84 InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString
, const int* executionContextId) | 85 InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString
, const int* executionContextId) |
| 85 { | 86 { |
| 86 if (!executionContextId) { | 87 if (!executionContextId) { |
| 87 ScriptState* scriptState = ScriptState::forMainWorld(m_page->mainFrame()
); | 88 ScriptState* scriptState = ScriptState::from(m_host->GetContext()); |
| 88 return injectedScriptManager()->injectedScriptFor(scriptState); | 89 return injectedScriptManager()->injectedScriptFor(scriptState); |
| 89 } | 90 } |
| 90 InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId
(*executionContextId); | 91 InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId
(*executionContextId); |
| 91 if (injectedScript.isEmpty()) | 92 if (injectedScript.isEmpty()) |
| 92 *errorString = "Execution context with given id not found."; | 93 *errorString = "Execution context with given id not found."; |
| 93 return injectedScript; | 94 return injectedScript; |
| 94 } | 95 } |
| 95 | 96 |
| 96 void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message) | 97 void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message) |
| 97 { | 98 { |
| 98 if (message) | 99 if (message) |
| 99 printf("OVERLAY MESSAGE: %s\n", message->ascii().data()); | 100 printf("OVERLAY MESSAGE: %s\n", message->ascii().data()); |
| 100 else | 101 else |
| 101 printf("OVERLAY REMOVED\n"); | 102 printf("OVERLAY REMOVED\n"); |
| 102 } | 103 } |
| 103 | 104 |
| 104 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) | 105 void PageDebuggerAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
| 105 { | 106 { |
| 106 reset(); | 107 reset(); |
| 107 scriptDebugServer().setPreprocessorSource(String()); | 108 scriptDebugServer().setPreprocessorSource(String()); |
| 108 } | 109 } |
| 109 | 110 |
| 110 } // namespace blink | 111 } // namespace blink |
| OLD | NEW |