Remove access to WebContents in RWHVA::SynchronousFrameMetadata()

content/browser/web_contents/web_contents_view_android.cc

 // Copyright (c) 2012 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/browser/web_contents/web_contents_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "cc/layers/layer.h"
@@ skipping 11 matching lines @@
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
+RenderWidgetHostViewAndroidDelegateImpl::
+RenderWidgetHostViewAndroidDelegateImpl(WebContentsImpl* web_contents)
+    : web_contents_(web_contents) {}
+
+bool RenderWidgetHostViewAndroidDelegateImpl::ShowingInterstitialPage() {
+  return web_contents_->ShowingInterstitialPage();
+}
+
+scoped_refptr<DevToolsAgentHost>
+RenderWidgetHostViewAndroidDelegateImpl::GetDevToolsAgentHost() {
+  return DevToolsAgentHost::HasFor(web_contents_) ?
+      DevToolsAgentHost::GetOrCreateFor(web_contents_) : nullptr;
+}
+
 // static
 void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
   const display::Display& display =
       display::Screen::GetScreen()->GetPrimaryDisplay();
   results->rect = display.bounds();
   // TODO(husky): Remove any system controls from availableRect.
   results->available_rect = display.work_area();
   results->device_scale_factor = display.device_scale_factor();
   results->orientation_angle = display.RotationAsDegree();
   results->orientation_type =
@@ skipping 135 matching lines @@
     DCHECK(RenderViewHostFactory::has_factory());
     return static_cast<RenderWidgetHostViewBase*>(
         render_widget_host->GetView());
   }
   // Note that while this instructs the render widget host to reference
   // |native_view_|, this has no effect without also instructing the
   // native view (i.e. ContentView) how to obtain a reference to this widget in
   // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
   // example of how this is achieved for InterstitialPages.
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  return new RenderWidgetHostViewAndroid(rwhi, content_view_core_);
+  return new RenderWidgetHostViewAndroid(rwhi, content_view_core_,
+      new RenderWidgetHostViewAndroidDelegateImpl(web_contents_));
 }
 
 RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  return new RenderWidgetHostViewAndroid(rwhi, NULL);
+  return new RenderWidgetHostViewAndroid(rwhi, nullptr, nullptr);
 }
 
 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) {
 }
 
 void WebContentsViewAndroid::RenderViewSwappedIn(RenderViewHost* host) {
 }
 
 void WebContentsViewAndroid::SetOverscrollControllerEnabled(bool enabled) {
 }
@@ skipping 119 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content