Move WebViewFrameWidget to use WebViewBase rather than WebViewImpl.

third_party/WebKit/Source/core/exported/WebViewBase.h

Index: third_party/WebKit/Source/core/exported/WebViewBase.h
diff --git a/third_party/WebKit/Source/core/exported/WebViewBase.h b/third_party/WebKit/Source/core/exported/WebViewBase.h
index ae72b40d8b1c173ec308396f19142eb2e5d82937..4221b1ae523530abb93db19e01a3beb5a8c5f7aa 100644
--- a/third_party/WebKit/Source/core/exported/WebViewBase.h
+++ b/third_party/WebKit/Source/core/exported/WebViewBase.h
@@ -6,6 +6,7 @@
 #define WebViewBase_h
 
 #include "platform/transforms/TransformationMatrix.h"
+#include "platform/wtf/RefCounted.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/web/WebElement.h"
@@ -13,18 +14,24 @@
 
 namespace blink {
 
+class AnimationWorkletProxyClient;
+class CompositorAnimationHost;
+class CompositorWorkerProxyClient;
 class CompositorAnimationTimeline;
 class ContextMenuProvider;
 class DevToolsEmulator;
 class Frame;
 class GraphicsLayer;
+class HitTestResult;
 class Page;
 class PaintLayerCompositor;
 class PagePopup;
 class PagePopupClient;
 class PageScaleConstraintsSet;
 class WebInputEvent;
+class WebInputMethodControllerImpl;
 class WebKeyboardEvent;
+class WebLayer;
 class WebLocalFrameImpl;
 class WebLayerTreeView;
 class WebPagePopupImpl;
@@ -38,8 +45,10 @@ struct WebRect;
 //
 // Once WebViewImpl is moved from web to core/exported then this class should be
 // removed and clients can once again depend on WebViewImpl.
-class WebViewBase : public WebView {
+class WebViewBase : public WebView, public RefCounted<WebViewBase> {
  public:
+  virtual ~WebViewBase() {}
+
   virtual void SetBaseBackgroundColor(WebColor) = 0;
   virtual void SetBaseBackgroundColorOverride(WebColor) = 0;
   virtual void ClearBaseBackgroundColorOverride() = 0;
@@ -146,6 +155,24 @@ class WebViewBase : public WebView {
   virtual double LastFrameTimeMonotonic() const = 0;
 
   static const WebInputEvent* CurrentInputEvent();
+
+  virtual void SetCompositorVisibility(bool) = 0;

[haraken, 2017/05/01 07:34:26]

I don't fully understand the changes at line 159 - 175. Why are the changes
needed?

[slangley, 2017/05/01 09:26:57]

Making methods that are currently not defined as virtual in WebViewImpl virtual
so we can substitute WebViewBase for WebViewImpl. In some cases the methods are
pulled down from WebViewWidget and we need to import them here so they're
defined in WebViewBase publicly.

You'll see the corresponding methods in WebViewImpl changed to override these
virtual methods.

+  using WebWidget::SetSuppressFrameRequestsWorkaroundFor704763Only;
+  using WebWidget::RecordWheelAndTouchScrollingCount;
+  using WebWidget::GetCompositionCharacterBounds;
+  // Returns the currently active WebInputMethodController which is the one
+  // corresponding to the focused frame. It will return nullptr if there is no
+  // focused frame, or if the there is one but it belongs to a different local

[haraken, 2017/05/01 07:34:26]

if there is

[slangley, 2017/05/01 09:26:57]

Done

+  // root.
+  virtual WebInputMethodControllerImpl* GetActiveWebInputMethodController()
+      const = 0;
+  virtual void ScheduleAnimationForWidget() = 0;
+  virtual CompositorWorkerProxyClient* CreateCompositorWorkerProxyClient() = 0;
+  virtual AnimationWorkletProxyClient* CreateAnimationWorkletProxyClient() = 0;
+  virtual void SetRootGraphicsLayer(GraphicsLayer*) = 0;
+  virtual void SetRootLayer(WebLayer*) = 0;
+  virtual CompositorAnimationHost* AnimationHost() const = 0;
+  virtual HitTestResult CoreHitTestResultAt(const WebPoint&) = 0;
 };
 }