Move WebViewFrameWidget to use WebViewBase rather than WebViewImpl.

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 26 matching lines @@
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/EventWithHitTestResults.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/heap/Handle.h"
 #include "platform/scheduler/child/web_scheduler.h"
 #include "platform/wtf/Compiler.h"
 #include "platform/wtf/HashSet.h"
-#include "platform/wtf/RefCounted.h"
 #include "platform/wtf/Vector.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebFloatSize.h"
 #include "public/platform/WebGestureCurveTarget.h"
 #include "public/platform/WebGestureEvent.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebInputEventResult.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
@@ skipping 33 matching lines @@
 class WebLocalFrame;
 class WebLocalFrameImpl;
 class CompositorMutatorImpl;
 class WebPlugin;
 class WebRemoteFrame;
 class WebSettingsImpl;
 class WebViewScheduler;
 
 class WEB_EXPORT WebViewImpl final
     : NON_EXPORTED_BASE(public WebViewBase),
-      public RefCounted<WebViewImpl>,
       NON_EXPORTED_BASE(public WebGestureCurveTarget),
       public PageWidgetEventHandler,
       public WebScheduler::InterventionReporter,
       public WebViewScheduler::WebViewSchedulerSettings {
  public:
   static WebViewImpl* Create(WebViewClient*, WebPageVisibilityState);
   static HashSet<WebViewImpl*>& AllInstances();
 
   // WebWidget methods:
   void Close() override;
@@ skipping 148 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&);
+  HitTestResult CoreHitTestResultAt(const WebPoint&) override;
   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;
@@ skipping 174 matching lines @@
   LinkHighlightImpl* GetLinkHighlight(int i) {
     return link_highlights_[i].get();
   }
 
   WebSettingsImpl* SettingsImpl() override;
 
   // Returns the bounding box of the block type node touched by the WebPoint.
   WebRect ComputeBlockBound(const WebPoint&, bool ignore_clipping);
 
   WebLayerTreeView* LayerTreeView() const override { return layer_tree_view_; }
-  CompositorAnimationHost* AnimationHost() const {
+  CompositorAnimationHost* AnimationHost() const override {
     return animation_host_.get();
   }
 
   bool MatchesHeuristicsForGpuRasterizationForTesting() const {
     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() override;
 
   void ForceNextWebGLContextCreationToFail() override;
   void ForceNextDrawingBufferCreationToFail() override;
 
-  CompositorWorkerProxyClient* CreateCompositorWorkerProxyClient();
-  AnimationWorkletProxyClient* CreateAnimationWorkletProxyClient();
+  CompositorWorkerProxyClient* CreateCompositorWorkerProxyClient() override;
+  AnimationWorkletProxyClient* CreateAnimationWorkletProxyClient() override;
 
   IntSize MainFrameSize() override;
   WebDisplayMode DisplayMode() const override { return display_mode_; }
 
   PageScaleConstraintsSet& GetPageScaleConstraintsSet() const override;
 
   FloatSize ElasticOverscroll() const override { return elastic_overscroll_; }
 
   double LastFrameTimeMonotonic() const override {
     return last_frame_time_monotonic_;
@@ skipping 25 matching lines @@
   void RefreshPageScaleFactorAfterLayout();
   IntSize ContentsSize() const;
 
   void ResizeFrameView(WebLocalFrameImpl* webframe);
   void UpdateICBAndResizeViewport();
   void ResizeViewWhileAnchored(float browser_controls_height,
                                bool browser_controls_shrink_layout);
 
   // Overrides the compositor visibility. See the description of
   // m_overrideCompositorVisibility for more details.
-  void SetCompositorVisibility(bool);
+  void SetCompositorVisibility(bool) override;
 
   // TODO(lfg): Remove once WebViewFrameWidget is deleted.
-  void ScheduleAnimationForWidget();
+  void ScheduleAnimationForWidget() override;
   bool GetCompositionCharacterBounds(WebVector<WebRect>&) override;
 
   void UpdateBaseBackgroundColor();
 
   friend class WebView;  // So WebView::Create can call our constructor
   friend class WebViewFrameWidget;
   friend class WTF::RefCounted<WebViewImpl>;
   friend void SetCurrentInputEventForTest(const WebInputEvent*);
 
   explicit WebViewImpl(WebViewClient*, WebPageVisibilityState);
@@ skipping 41 matching lines @@
                                                     WebGestureDevice) const;
 
   void EnablePopupMouseWheelEventListener(WebLocalFrameImpl* local_root);
   void DisablePopupMouseWheelEventListener();
 
   void CancelPagePopup();
   void UpdatePageOverlays();
 
   float DeviceScaleFactor() const;
 
-  void SetRootGraphicsLayer(GraphicsLayer*);
-  void SetRootLayer(WebLayer*);
+  void SetRootGraphicsLayer(GraphicsLayer*) override;
+  void SetRootLayer(WebLayer*) override;
   void AttachCompositorAnimationTimeline(CompositorAnimationTimeline*);
   void DetachCompositorAnimationTimeline(CompositorAnimationTimeline*);
 
   LocalFrame* FocusedLocalFrameInWidget() const;
   LocalFrame* FocusedLocalFrameAvailableForIme() const;
 
   CompositorMutatorImpl& Mutator();
 
   WebViewClient* client_;  // Can be 0 (e.g. unittests, shared workers, etc.)
   WebSpellCheckClient* spell_check_client_;
@@ skipping 138 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