OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/guest_view/renderer/guest_view_request.h" | 5 #include "components/guest_view/renderer/guest_view_request.h" |
6 | 6 |
7 #include <tuple> | 7 #include <tuple> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "components/guest_view/common/guest_view_messages.h" | 10 #include "components/guest_view/common/guest_view_messages.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 return; | 90 return; |
91 | 91 |
92 v8::HandleScope handle_scope(isolate()); | 92 v8::HandleScope handle_scope(isolate()); |
93 blink::WebFrame* frame = guest_proxy_render_view->GetWebView()->mainFrame(); | 93 blink::WebFrame* frame = guest_proxy_render_view->GetWebView()->mainFrame(); |
94 // TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running | 94 // TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running |
95 // on top of out-of-process iframes. Remove it once the code is converted. | 95 // on top of out-of-process iframes. Remove it once the code is converted. |
96 v8::Local<v8::Value> window; | 96 v8::Local<v8::Value> window; |
97 if (frame->isWebLocalFrame()) { | 97 if (frame->isWebLocalFrame()) { |
98 window = frame->mainWorldScriptContext()->Global(); | 98 window = frame->mainWorldScriptContext()->Global(); |
99 } else { | 99 } else { |
100 window = | 100 window = frame->toWebRemoteFrame()->globalProxy(); |
101 frame->toWebRemoteFrame()->deprecatedMainWorldScriptContext()->Global(); | |
102 } | 101 } |
103 | 102 |
104 const int argc = 1; | 103 const int argc = 1; |
105 std::unique_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]); | 104 std::unique_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]); |
106 argv[0] = window; | 105 argv[0] = window; |
107 | 106 |
108 // Call the AttachGuest API's callback with the guest proxy as the first | 107 // Call the AttachGuest API's callback with the guest proxy as the first |
109 // parameter. | 108 // parameter. |
110 ExecuteCallbackIfAvailable(argc, std::move(argv)); | 109 ExecuteCallbackIfAvailable(argc, std::move(argv)); |
111 } | 110 } |
(...skipping 14 matching lines...) Expand all Loading... |
126 | 125 |
127 container()->render_frame()->DetachGuest(container()->element_instance_id()); | 126 container()->render_frame()->DetachGuest(container()->element_instance_id()); |
128 } | 127 } |
129 | 128 |
130 void GuestViewDetachRequest::HandleResponse(const IPC::Message& message) { | 129 void GuestViewDetachRequest::HandleResponse(const IPC::Message& message) { |
131 DCHECK(message.type() == GuestViewMsg_GuestDetached::ID); | 130 DCHECK(message.type() == GuestViewMsg_GuestDetached::ID); |
132 ExecuteCallbackIfAvailable(0 /* argc */, nullptr); | 131 ExecuteCallbackIfAvailable(0 /* argc */, nullptr); |
133 } | 132 } |
134 | 133 |
135 } // namespace guest_view | 134 } // namespace guest_view |
OLD | NEW |