RenderWidget/RenderView: encapsulate ViewHostMsg_Show, etc, in a callback

content/renderer/render_widget_fullscreen_pepper.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "content/renderer/mouse_lock_dispatcher.h"
 #include "content/renderer/pepper/fullscreen_container.h"
-#include "content/renderer/render_widget_fullscreen.h"
+#include "content/renderer/render_widget.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "url/gurl.h"
 
 namespace blink {
 class WebLayer;
 }
 
 namespace content {
+class CompositorDependencies;
 class PepperPluginInstanceImpl;
+class RenderFrameImpl;

[alexmos, 2016/11/17 09:51:09]

where is this needed?

[ncarter (slow), 2016/11/17 19:33:11]

Was cruft; removed.

 
 // A RenderWidget that hosts a fullscreen pepper plugin. This provides a
 // FullscreenContainer that the plugin instance can callback into to e.g.
 // invalidate rects.
-class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
+class RenderWidgetFullscreenPepper : public RenderWidget,
                                      public FullscreenContainer {
  public:
   static RenderWidgetFullscreenPepper* Create(
       int32_t routing_id,
-      int32_t opener_id,
+      const RenderWidget::ShowCallback& show_callback,
       CompositorDependencies* compositor_deps,
       PepperPluginInstanceImpl* plugin,
       const GURL& active_url,
       const ScreenInfo& screen_info);
 
   // pepper::FullscreenContainer API.
   void Invalidate() override;
   void InvalidateRect(const blink::WebRect& rect) override;
   void ScrollRect(int dx, int dy, const blink::WebRect& rect) override;
   void Destroy() override;
@@ skipping 17 matching lines @@
                                PepperPluginInstanceImpl* plugin,
                                const GURL& active_url,
                                const ScreenInfo& screen_info);
   ~RenderWidgetFullscreenPepper() override;
 
   // RenderWidget API.
   void DidInitiatePaint() override;
   void Close() override;
   void OnResize(const ResizeParams& params) override;
 
-  // RenderWidgetFullscreen API.
-  blink::WebWidget* CreateWebWidget() override;
-
   // RenderWidget overrides.
   GURL GetURLForGraphicsContext3D() override;
   void OnDeviceScaleFactorChanged() override;
 
  private:
   // URL that is responsible for this widget, passed to ggl::CreateViewContext.
   GURL active_url_;
 
   // The plugin instance this widget wraps.
   PepperPluginInstanceImpl* plugin_;
 
   blink::WebLayer* layer_;
 
   std::unique_ptr<MouseLockDispatcher> mouse_lock_dispatcher_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetFullscreenPepper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_