Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame.

content/shell/test_runner/test_runner_for_specific_view.cc

 // Copyright 2016 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 "content/shell/test_runner/test_runner_for_specific_view.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
@@ skipping 167 matching lines @@
   std::vector<v8::UniquePersistent<v8::Value>> empty_args;
   InvokeV8CallbackWithArgs(callback, std::move(empty_args));
 }
 
 void TestRunnerForSpecificView::InvokeV8CallbackWithArgs(
     const v8::UniquePersistent<v8::Function>& callback,
     const std::vector<v8::UniquePersistent<v8::Value>>& args) {
   v8::Isolate* isolate = blink::MainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
-  WebFrame* frame = web_view()->MainFrame();
+  blink::WebLocalFrame* frame = GetLocalMainFrame();
   v8::Local<v8::Context> context = frame->MainWorldScriptContext();
   if (context.IsEmpty())
     return;
   v8::Context::Scope context_scope(context);
 
   std::vector<v8::Local<v8::Value>> local_args;
   for (const auto& arg : args) {
     local_args.push_back(v8::Local<v8::Value>::New(isolate, arg));
   }
 
@@ skipping 43 matching lines @@
                      base::Passed(std::move(persistent_callback))));
 }
 
 void TestRunnerForSpecificView::CapturePixelsCallback(
     v8::UniquePersistent<v8::Function> callback,
     const SkBitmap& snapshot) {
   v8::Isolate* isolate = blink::MainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
   v8::Local<v8::Context> context =
-      web_view()->MainFrame()->MainWorldScriptContext();
+      GetLocalMainFrame()->MainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
   v8::Context::Scope context_scope(context);
   v8::Local<v8::Value> argv[3];
 
   // Size can be 0 for cases where copyImageAt was called on position
   // that doesn't have an image.
   int width = snapshot.info().width();
   argv[0] = v8::Number::New(isolate, width);
@@ skipping 61 matching lines @@
           blink::MainThreadIsolate(), callback))));
 }
 
 void TestRunnerForSpecificView::GetBluetoothManualChooserEventsCallback(
     v8::UniquePersistent<v8::Function> callback,
     const std::vector<std::string>& events) {
   // Build the V8 context.
   v8::Isolate* isolate = blink::MainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Context> context =
-      web_view()->MainFrame()->MainWorldScriptContext();
+      GetLocalMainFrame()->MainWorldScriptContext();
   if (context.IsEmpty())
     return;
   v8::Context::Scope context_scope(context);
 
   // Convert the argument.
   v8::Local<v8::Value> arg;
   if (!gin::TryConvertToV8(isolate, events, &arg))
     return;
 
   // Call the callback.
@@ skipping 56 matching lines @@
               blink::MainThreadIsolate(), callback))));
 }
 
 void TestRunnerForSpecificView::DispatchBeforeInstallPromptCallback(
     v8::UniquePersistent<v8::Function> callback,
     bool canceled) {
   v8::Isolate* isolate = blink::MainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
   v8::Local<v8::Context> context =
-      web_view()->MainFrame()->MainWorldScriptContext();
+      GetLocalMainFrame()->MainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
   v8::Context::Scope context_scope(context);
   v8::Local<v8::Value> arg;
   arg = v8::Boolean::New(isolate, canceled);
 
   PostV8CallbackWithArgs(std::move(callback), 1, &arg);
 }
 
@@ skipping 143 matching lines @@
 }
 
 void TestRunnerForSpecificView::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view()->DidLosePointerLock();
 }
 
 bool TestRunnerForSpecificView::CallShouldCloseOnWebView() {
-  if (!web_view()->MainFrame()->ToWebLocalFrame()) {
-    CHECK(false) << "This function cannot be called if the main frame is not a "
-                    "local frame.";
-  }
-
-  return web_view()->MainFrame()->ToWebLocalFrame()->DispatchBeforeUnloadEvent(
-      false);
+  return GetLocalMainFrame()->DispatchBeforeUnloadEvent(false);
 }
 
 void TestRunnerForSpecificView::SetDomainRelaxationForbiddenForURLScheme(
     bool forbidden,
     const std::string& scheme) {
   web_view()->SetDomainRelaxationForbidden(forbidden,
                                            WebString::FromUTF8(scheme));
 }
 
 v8::Local<v8::Value>
@@ skipping 63 matching lines @@
     else if (option == "StartInSelection")
       find_options.find_next = false;
     else if (option == "AtWordStarts")
       find_options.word_start = true;
     else if (option == "TreatMedialCapitalAsWordStart")
       find_options.medial_capital_as_word_start = true;
     else if (option == "WrapAround")
       wrap_around = true;
   }
 
-  WebLocalFrame* frame = web_view()->MainFrame()->ToWebLocalFrame();
+  WebLocalFrame* frame = GetLocalMainFrame();
   const bool find_result = frame->Find(0, WebString::FromUTF8(search_text),
                                        find_options, wrap_around, 0);
   frame->StopFinding(WebLocalFrame::kStopFindActionKeepSelection);
   return find_result;
 }
 
 std::string TestRunnerForSpecificView::SelectionAsMarkup() {
-  if (!web_view()->MainFrame()->ToWebLocalFrame()) {
-    CHECK(false) << "This function cannot be called if the main frame is not a "
-                    "local frame.";
-  }
-  return web_view()->MainFrame()->ToWebLocalFrame()->SelectionAsMarkup().Utf8();
+  return GetLocalMainFrame()->SelectionAsMarkup().Utf8();
 }
 
 void TestRunnerForSpecificView::SetViewSourceForFrame(const std::string& name,
                                                       bool enabled) {
-  if (!web_view()->MainFrame()->IsWebLocalFrame()) {
-    CHECK(false) << "This function cannot be called if the main frame is not a "
-                    "local frame.";
-  }
-
   WebFrame* target_frame =
-      web_view()->MainFrame()->ToWebLocalFrame()->FindFrameByName(
-          WebString::FromUTF8(name));
+      GetLocalMainFrame()->FindFrameByName(WebString::FromUTF8(name));
   if (target_frame)
     target_frame->EnableViewSourceMode(enabled);
 }
 
+blink::WebLocalFrame* TestRunnerForSpecificView::GetLocalMainFrame() {
+  if (!web_view()->MainFrame()->IsWebLocalFrame()) {
+    // Hitting the check below uncovers a new scenario that requires OOPIF
+    // support in the layout tests harness.
+    CHECK(false) << "This function cannot be called if the main frame is not a "
+                    "local frame.";
+  }

[Avi (use Gerrit), 2017/06/09 18:37:24]

👍

+  return web_view()->MainFrame()->ToWebLocalFrame();
+}
+
 blink::WebView* TestRunnerForSpecificView::web_view() {
   return web_view_test_proxy_base_->web_view();
 }
 
 WebTestDelegate* TestRunnerForSpecificView::delegate() {
   return web_view_test_proxy_base_->delegate();
 }
 
 }  // namespace test_runner