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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame) | 76 void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame) |
77 { | 77 { |
78 if (m_webFrame == frame) { | 78 if (m_webFrame == frame) { |
79 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 79 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
80 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame()
); | 80 ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame()
); |
81 ScriptState::Scope scope(scriptState); | 81 ScriptState::Scope scope(scriptState); |
82 | 82 |
83 if (m_devtoolsHost) | 83 if (m_devtoolsHost) |
84 m_devtoolsHost->disconnectClient(); | 84 m_devtoolsHost->disconnectClient(); |
85 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); | 85 m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame()); |
86 v8::Handle<v8::Object> global = scriptState->context()->Global(); | 86 v8::Local<v8::Object> global = scriptState->context()->Global(); |
87 v8::Handle<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), globa
l, scriptState->isolate()); | 87 v8::Local<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), global
, scriptState->isolate()); |
88 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj); | 88 global->Set(v8AtomicString(isolate, "DevToolsHost"), devtoolsHostObj); |
89 } | 89 } |
90 | 90 |
91 if (m_injectedScriptForOrigin.isEmpty()) | 91 if (m_injectedScriptForOrigin.isEmpty()) |
92 return; | 92 return; |
93 | 93 |
94 String origin = frame->securityOrigin().toString(); | 94 String origin = frame->securityOrigin().toString(); |
95 String script = m_injectedScriptForOrigin.get(origin); | 95 String script = m_injectedScriptForOrigin.get(origin); |
96 if (script.isEmpty()) | 96 if (script.isEmpty()) |
97 return; | 97 return; |
(...skipping 27 matching lines...) Expand all Loading... |
125 { | 125 { |
126 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin
t(x, y, menuProvider); | 126 WebLocalFrameImpl::fromFrame(targetFrame)->viewImpl()->showContextMenuAtPoin
t(x, y, menuProvider); |
127 } | 127 } |
128 | 128 |
129 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c
onst String& source) | 129 void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, c
onst String& source) |
130 { | 130 { |
131 m_injectedScriptForOrigin.set(origin, source); | 131 m_injectedScriptForOrigin.set(origin, source); |
132 } | 132 } |
133 | 133 |
134 } // namespace blink | 134 } // namespace blink |
OLD | NEW |