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

third_party/WebKit/Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 250 matching lines @@
   void DidUpdateFullscreenSize() override;
 
   float DefaultMinimumPageScaleFactor() const override;
   float DefaultMaximumPageScaleFactor() const override;
   float MinimumPageScaleFactor() const override;
   float MaximumPageScaleFactor() const override;
   float ClampPageScaleFactorToLimits(float) const override;
   void ResetScaleStateImmediately() override;
 
   HitTestResult CoreHitTestResultAt(const WebPoint&);
-  void InvalidateRect(const IntRect&);
+  void InvalidateRect(const IntRect&) override;
 
   void SetBaseBackgroundColor(WebColor) override;
   void SetBaseBackgroundColorOverride(WebColor) override;
   void ClearBaseBackgroundColorOverride() override;
   void SetBackgroundColorOverride(WebColor) override;
   void ClearBackgroundColorOverride() override;
   void SetZoomFactorOverride(float) override;
   void SetCompositorDeviceScaleFactorOverride(float) override;
   void SetDeviceEmulationTransform(const TransformationMatrix&) override;
   TransformationMatrix GetDeviceEmulationTransformForTesting() const;
@@ skipping 63 matching lines @@
   // load. isNavigationWithinPage will be true if the navigation does
   // not take the user away from the current page.
   void DidCommitLoad(bool is_new_navigation,
                      bool is_navigation_within_page) override;
 
   // Indicates two things:
   //   1) This view may have a new layout now.
   //   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;
   void MainFrameScrollOffsetChanged() override;
 
   // Returns true if popup menus should be rendered by the browser, false if
   // they should be rendered by WebKit (which is the default).
   static bool UseExternalPopupMenus();
 
   bool ShouldAutoResize() const override { return should_auto_resize_; }
 
   IntSize MinAutoSize() const override { return min_auto_size_; }
 
   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.
   static const WebInputEvent* CurrentInputEvent() {
     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();
   }
 
   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
   // if the zoom change was triggered by the browser, it's only needed in case
   // a plugin can update its own zoom, say because of its own UI.
   void FullFramePluginZoomLevelChanged(double zoom_level);
 
   void ComputeScaleAndScrollForBlockRect(
       const WebPoint& hit_point,
       const WebRect& block_rect,
@@ skipping 24 matching lines @@
   IntPoint FakePageScaleAnimationTargetPositionForTesting() const {
     return fake_page_scale_animation_target_position_;
   }
   float FakePageScaleAnimationPageScaleForTesting() const {
     return fake_page_scale_animation_page_scale_factor_;
   }
   bool FakePageScaleAnimationUseAnchorForTesting() const {
     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();
 
   // Exposed for testing purposes.
   bool HasHorizontalScrollbar();
   bool HasVerticalScrollbar();
 
   // Exposed for tests.
   unsigned NumLinkHighlights() { return link_highlights_.size(); }
@@ skipping 15 matching lines @@
     return matches_heuristics_for_gpu_rasterization_;
   }
 
   void UpdateBrowserControlsState(WebBrowserControlsState constraint,
                                   WebBrowserControlsState current,
                                   bool animate) override;
 
   BrowserControls& GetBrowserControls();
   // Called anytime browser controls layout height or content offset have
   // changed.
-  void DidUpdateBrowserControls();
+  void DidUpdateBrowserControls() override;
 
   void ForceNextWebGLContextCreationToFail() override;
   void ForceNextDrawingBufferCreationToFail() override;
 
   CompositorWorkerProxyClient* CreateCompositorWorkerProxyClient();
   AnimationWorkletProxyClient* CreateAnimationWorkletProxyClient();
 
   IntSize MainFrameSize() override;
   WebDisplayMode DisplayMode() const override { return display_mode_; }
 
   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(); }
 
   // 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
   // root.
   WebInputMethodControllerImpl* GetActiveWebInputMethodController() const;
 
   void SetLastHiddenPagePopup(WebPagePopupImpl* page_popup) override {
@@ skipping 239 matching lines @@
   Persistent<ResizeViewportAnchor> resize_viewport_anchor_;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 }  // namespace blink
 
 #endif