Move more methods from WebViewImpl to WebViewBase, and cut dependencies.

third_party/WebKit/Source/web/WebViewImpl.h

Index: third_party/WebKit/Source/web/WebViewImpl.h
diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
index a40f52fee6fe5b6d70214f1fb21836895e0872d9..19ecc321cebe29dc3b7acd77d4ac105b26a22e64 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.h
+++ b/third_party/WebKit/Source/web/WebViewImpl.h
@@ -268,7 +268,7 @@ class WEB_EXPORT WebViewImpl final
   void ResetScaleStateImmediately() override;
 
   HitTestResult CoreHitTestResultAt(const WebPoint&);
-  void InvalidateRect(const IntRect&);
+  void InvalidateRect(const IntRect&) override;
 
   void SetBaseBackgroundColor(WebColor) override;
   void SetBaseBackgroundColorOverride(WebColor) override;
@@ -352,8 +352,8 @@ class WEB_EXPORT WebViewImpl final
   //   2) Calling updateAllLifecyclePhases() is a no-op.
   // After calling WebWidget::updateAllLifecyclePhases(), expect to get this
   // notification unless the view did not need a layout.
-  void LayoutUpdated(WebLocalFrameImpl*);
-  void ResizeAfterLayout(WebLocalFrameImpl*);
+  void LayoutUpdated(WebLocalFrameImpl*) override;
+  void ResizeAfterLayout(WebLocalFrameImpl*) override;
 
   void DidChangeContentsSize() override;
   void PageScaleFactorChanged() override;
@@ -370,12 +370,13 @@ class WEB_EXPORT WebViewImpl final
   IntSize MaxAutoSize() const override { return max_auto_size_; }
 
   void UpdateMainFrameLayoutSize() override;
-  void UpdatePageDefinedViewportConstraints(const ViewportDescription&);
+  void UpdatePageDefinedViewportConstraints(
+      const ViewportDescription&) override;
 
-  PagePopup* OpenPagePopup(PagePopupClient*);
-  void ClosePagePopup(PagePopup*);
-  void CleanupPagePopup();
-  LocalDOMWindow* PagePopupWindow() const;
+  PagePopup* OpenPagePopup(PagePopupClient*) override;
+  void ClosePagePopup(PagePopup*) override;
+  void CleanupPagePopup() override;
+  LocalDOMWindow* PagePopupWindow() const override;
 
   // Returns the input event we're currently processing. This is used in some
   // cases where the WebCore DOM event doesn't have the information we need.
@@ -383,9 +384,9 @@ class WEB_EXPORT WebViewImpl final
     return current_input_event_;
   }
 
-  GraphicsLayer* RootGraphicsLayer();
-  void RegisterViewportLayersWithCompositor();
-  PaintLayerCompositor* Compositor() const;
+  GraphicsLayer* RootGraphicsLayer() override;
+  void RegisterViewportLayersWithCompositor() override;
+  PaintLayerCompositor* Compositor() const override;
   CompositorAnimationTimeline* LinkHighlightsTimeline() const override {
     return link_highlights_timeline_.get();
   }
@@ -393,7 +394,7 @@ class WEB_EXPORT WebViewImpl final
   WebViewScheduler* Scheduler() const override;
   void SetVisibilityState(WebPageVisibilityState, bool) override;
 
-  bool HasOpenedPopup() const { return page_popup_.Get(); }
+  bool HasOpenedPopup() const override { return page_popup_.Get(); }
 
   // Called by a full frame plugin inside this view to inform it that its
   // zoom level has been updated.  The plugin should only call this function
@@ -438,9 +439,9 @@ class WEB_EXPORT WebViewImpl final
     return fake_page_scale_animation_use_anchor_;
   }
 
-  void EnterFullscreen(LocalFrame&);
-  void ExitFullscreen(LocalFrame&);
-  void FullscreenElementChanged(Element*, Element*);
+  void EnterFullscreen(LocalFrame&) override;
+  void ExitFullscreen(LocalFrame&) override;
+  void FullscreenElementChanged(Element*, Element*) override;
 
   // Exposed for the purpose of overriding device metrics.
   void SendResizeEventAndRepaint();
@@ -476,7 +477,7 @@ class WEB_EXPORT WebViewImpl final
   BrowserControls& GetBrowserControls();
   // Called anytime browser controls layout height or content offset have
   // changed.
-  void DidUpdateBrowserControls();
+  void DidUpdateBrowserControls() override;
 
   void ForceNextWebGLContextCreationToFail() override;
   void ForceNextDrawingBufferCreationToFail() override;
@@ -489,9 +490,11 @@ class WEB_EXPORT WebViewImpl final
 
   PageScaleConstraintsSet& GetPageScaleConstraintsSet() const override;
 
-  FloatSize ElasticOverscroll() const { return elastic_overscroll_; }
+  FloatSize ElasticOverscroll() const override { return elastic_overscroll_; }
 
-  double LastFrameTimeMonotonic() const { return last_frame_time_monotonic_; }
+  double LastFrameTimeMonotonic() const override {
+    return last_frame_time_monotonic_;
+  }
 
   ChromeClientImpl& ChromeClient() const { return *chrome_client_impl_.Get(); }