Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame.

extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 
 #include <map>
 #include <set>
 
 #include "base/macros.h"
@@ skipping 218 matching lines @@
   if (!guest_proxy_render_view)
     return;
   blink::WebFrame* guest_proxy_frame =
       guest_proxy_render_view->GetWebView()->MainFrame();
   if (!guest_proxy_frame)
     return;
 
   v8::Context::Scope context_scope(
       render_frame()->GetWebFrame()->MainWorldScriptContext());
 
   // TODO(lazyboy,nasko): The WebLocalFrame branch is not used when running

[lfg, 2017/06/09 18:53:14]

Please remove the comment.

[Łukasz Anforowicz, 2017/06/09 18:56:26]

Ooops.  Done.

   // on top of out-of-process iframes. Remove it once the code is converted.
-  v8::Local<v8::Object> guest_proxy_window;
-  if (guest_proxy_frame->IsWebLocalFrame()) {
-    guest_proxy_window = guest_proxy_frame->MainWorldScriptContext()->Global();
-  } else {
-    guest_proxy_window = guest_proxy_frame->ToWebRemoteFrame()->GlobalProxy();
-  }
+  v8::Local<v8::Object> guest_proxy_window = guest_proxy_frame->GlobalProxy();
   gin::Dictionary window_object(isolate, guest_proxy_window);
   v8::Local<v8::Function> post_message;
   if (!window_object.Get(std::string(kPostMessageName), &post_message))
     return;
 
   v8::Local<v8::Value> args[] = {
       message,
       // Post the message to any domain inside the browser plugin. The embedder
       // should already know what is embedded.
       gin::StringToV8(isolate, "*")};
   render_frame()->GetWebFrame()->CallFunctionEvenIfScriptDisabled(
       post_message.As<v8::Function>(), guest_proxy_window, arraysize(args),
       args);
 }
 
 void MimeHandlerViewContainer::PostMessageFromValue(
     const base::Value& message) {
-  blink::WebFrame* frame = render_frame()->GetWebFrame();
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   if (!frame)
     return;
 
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(frame->MainWorldScriptContext());
   std::unique_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
   PostMessage(isolate,
               converter->ToV8Value(&message, frame->MainWorldScriptContext()));
@@ skipping 20 matching lines @@
 void MimeHandlerViewContainer::OnMimeHandlerViewGuestOnLoadCompleted(
     int /* unused */) {
   if (!render_frame())
     return;
 
   guest_loaded_ = true;
   if (pending_messages_.empty())
     return;
 
   // Now that the guest has loaded, flush any unsent messages.
-  blink::WebFrame* frame = render_frame()->GetWebFrame();
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   if (!frame)
     return;
 
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(frame->MainWorldScriptContext());
   for (const auto& pending_message : pending_messages_)
     PostMessage(isolate, v8::Local<v8::Value>::New(isolate, pending_message));
 
   pending_messages_.clear();
@@ skipping 11 matching lines @@
   if (!render_frame())
     return;
 
   render_frame()->Send(
       new ExtensionsGuestViewHostMsg_CreateMimeHandlerViewGuest(
           render_frame()->GetRoutingID(), view_id_, element_instance_id(),
           element_size_));
 }
 
 }  // namespace extensions