Move ZoomToFindInPageRect into a common implementation.

Instead of two overloads move the implementation into the base class
as this will facilitate the removal of the subclasses.

BUG=1097816

Change-Id: I37fbd348ab028d664de85c1b41a19035d75eda55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538126
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828417}

third_party/blink/renderer/core/frame/web_frame_widget_base.cc

@@ -2931,6 +2931,16 @@ void WebFrameWidgetBase::ScrollFocusedEditableNodeIntoRect(
   local_frame->Client()->ScrollFocusedEditableElementIntoRect(rect_in_dips);
 }
 
+void WebFrameWidgetBase::ZoomToFindInPageRect(
+    const WebRect& rect_in_root_frame) {
+  if (ForMainFrame()) {
+    View()->ZoomToFindInPageRect(rect_in_root_frame);
+  } else {
+    GetAssociatedFrameWidgetHost()->ZoomToFindInPageRectInMainFrame(
+        gfx::Rect(rect_in_root_frame));
+  }
+}
+
 void WebFrameWidgetBase::MoveCaret(const gfx::Point& point_in_dips) {
   WebLocalFrame* focused_frame = FocusedWebLocalFrameInWidget();
   if (!focused_frame)

third_party/blink/renderer/core/frame/web_frame_widget_base.h

@@ -244,6 +244,7 @@ class CORE_EXPORT WebFrameWidgetBase
   void MoveRangeSelectionExtent(const gfx::Point& extent_in_dips) override;
   void ScrollFocusedEditableNodeIntoRect(
       const gfx::Rect& rect_in_dips) override;
+  void ZoomToFindInPageRect(const WebRect& rect_in_root_frame) override;
   void MoveCaret(const gfx::Point& point_in_dips) override;
 #if defined(OS_ANDROID)
   void SelectWordAroundCaret(SelectWordAroundCaretCallback callback) override;

third_party/blink/renderer/core/frame/web_frame_widget_impl.cc

@@ -491,12 +491,6 @@ void WebFrameWidgetImpl::SetRootLayer(scoped_refptr<cc::Layer> layer) {
   widget_base_->LayerTreeHost()->SetRootLayer(layer);
 }
 
-void WebFrameWidgetImpl::ZoomToFindInPageRect(
-    const WebRect& rect_in_root_frame) {
-  GetAssociatedFrameWidgetHost()->ZoomToFindInPageRectInMainFrame(
-      gfx::Rect(rect_in_root_frame));
-}
-
 void WebFrameWidgetImpl::SetAutoResizeMode(bool auto_resize,
                                            const gfx::Size& min_size_before_dsf,
                                            const gfx::Size& max_size_before_dsf,

third_party/blink/renderer/core/frame/web_frame_widget_impl.h

@@ -103,7 +103,6 @@ class WebFrameWidgetImpl final : public WebFrameWidgetBase {
   bool ForSubframe() const override { return true; }
   bool ForTopLevelFrame() const override { return false; }
   void DidCreateLocalRootView() override;
-  void ZoomToFindInPageRect(const WebRect& rect_in_root_frame) override;
   void SetAutoResizeMode(bool auto_resize,
                          const gfx::Size& min_size_before_dsf,
                          const gfx::Size& max_size_before_dsf,

third_party/blink/renderer/core/frame/web_view_frame_widget.cc

@@ -129,11 +129,6 @@ void WebViewFrameWidget::SetRootLayer(scoped_refptr<cc::Layer> root_layer) {
   web_view_->DidChangeRootLayer(!!root_layer);
 }
 
-void WebViewFrameWidget::ZoomToFindInPageRect(
-    const WebRect& rect_in_root_frame) {
-  web_view_->ZoomToFindInPageRect(rect_in_root_frame);
-}
-
 void WebViewFrameWidget::HandleMouseLeave(LocalFrame& main_frame,
                                           const WebMouseEvent& event) {
   web_view_->SetMouseOverURL(WebURL());

third_party/blink/renderer/core/frame/web_view_frame_widget.h

@@ -72,7 +72,6 @@ class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase {
   // WebFrameWidgetBase overrides:
   bool ForSubframe() const override { return false; }
   bool ForTopLevelFrame() const override { return !is_for_nested_main_frame_; }
-  void ZoomToFindInPageRect(const WebRect& rect_in_root_frame) override;
   void SetAutoResizeMode(bool auto_resize,
                          const gfx::Size& min_size_before_dsf,
                          const gfx::Size& max_size_before_dsf,