| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 "web/WebDevToolsFrontendImpl.h" | 31 #include "web/WebDevToolsFrontendImpl.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptController.h" | 33 #include "bindings/core/v8/ScriptController.h" |
| 34 #include "bindings/core/v8/V8Binding.h" |
| 34 #include "bindings/core/v8/V8DevToolsHost.h" | 35 #include "bindings/core/v8/V8DevToolsHost.h" |
| 35 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
| 36 #include "core/inspector/DevToolsHost.h" | 37 #include "core/inspector/DevToolsHost.h" |
| 37 #include "core/page/Page.h" | 38 #include "core/page/Page.h" |
| 38 #include "public/platform/WebSecurityOrigin.h" | 39 #include "public/platform/WebSecurityOrigin.h" |
| 39 #include "public/platform/WebString.h" | 40 #include "public/platform/WebString.h" |
| 40 #include "public/web/WebDevToolsFrontendClient.h" | 41 #include "public/web/WebDevToolsFrontendClient.h" |
| 41 #include "web/WebLocalFrameImpl.h" | 42 #include "web/WebLocalFrameImpl.h" |
| 42 #include "web/WebViewImpl.h" | 43 #include "web/WebViewImpl.h" |
| 43 | 44 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 61 if (m_devtoolsHost) | 62 if (m_devtoolsHost) |
| 62 m_devtoolsHost->disconnectClient(); | 63 m_devtoolsHost->disconnectClient(); |
| 63 } | 64 } |
| 64 | 65 |
| 65 void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame) { | 66 void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame) { |
| 66 if (m_webFrame == frame) { | 67 if (m_webFrame == frame) { |
| 67 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 68 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 68 // Use higher limit for DevTools isolate so that it does not OOM when | 69 // Use higher limit for DevTools isolate so that it does not OOM when |
| 69 // profiling large heaps. | 70 // profiling large heaps. |
| 70 isolate->IncreaseHeapLimitForDebugging(); | 71 isolate->IncreaseHeapLimitForDebugging(); |
| 71 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame()); | 72 ScriptState* scriptState = toScriptStateForMainWorld(m_webFrame->frame()); |
| 72 DCHECK(scriptState); | 73 DCHECK(scriptState); |
| 73 ScriptState::Scope scope(scriptState); | 74 ScriptState::Scope scope(scriptState); |
| 74 | 75 |
| 75 if (m_devtoolsHost) | 76 if (m_devtoolsHost) |
| 76 m_devtoolsHost->disconnectClient(); | 77 m_devtoolsHost->disconnectClient(); |
| 77 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); | 78 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); |
| 78 v8::Local<v8::Object> global = scriptState->context()->Global(); | 79 v8::Local<v8::Object> global = scriptState->context()->Global(); |
| 79 v8::Local<v8::Value> devtoolsHostObj = | 80 v8::Local<v8::Value> devtoolsHostObj = |
| 80 ToV8(m_devtoolsHost.get(), global, scriptState->isolate()); | 81 ToV8(m_devtoolsHost.get(), global, scriptState->isolate()); |
| 81 DCHECK(!devtoolsHostObj.IsEmpty()); | 82 DCHECK(!devtoolsHostObj.IsEmpty()); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 ->viewImpl() | 117 ->viewImpl() |
| 117 ->showContextMenuAtPoint(x, y, menuProvider); | 118 ->showContextMenuAtPoint(x, y, menuProvider); |
| 118 } | 119 } |
| 119 | 120 |
| 120 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, | 121 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, |
| 121 const String& source) { | 122 const String& source) { |
| 122 m_injectedScriptForOrigin.set(origin, source); | 123 m_injectedScriptForOrigin.set(origin, source); |
| 123 } | 124 } |
| 124 | 125 |
| 125 } // namespace blink | 126 } // namespace blink |
| OLD | NEW |