Move GetSize from RenderView to WebView.

WebView already exposes a variety of Resize() methods, as well as
VisualViewportSize(), so it's the right place for the method to live.

Note that this technically consitutes a slight behavior change, since previously
we were returning the main RenderWidget size, and now we're returning the
WebView size. For pre-render, this should be functionally identical.

Bug: 912193
Change-Id: I884f7c93d7a8ca4549f63689934197207b0cb85e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1817325
Auto-Submit: Erik Chen <erikchen@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698932}

chrome/renderer/prerender/prerenderer_client.cc

@@ -29,8 +29,9 @@ PrerendererClient::~PrerendererClient() {
 void PrerendererClient::WillAddPrerender(blink::WebPrerender* prerender) {
   DVLOG(3) << "PrerendererClient::willAddPrerender url = "
            << prerender->Url().GetString().Utf8();
-  prerender->SetExtraData(new PrerenderExtraData(
-      ++s_last_prerender_id, routing_id(), render_view()->GetSize()));
+  prerender->SetExtraData(
+      new PrerenderExtraData(++s_last_prerender_id, routing_id(),
+                             render_view()->GetWebView()->GetSize()));
 }
 
 bool PrerendererClient::IsPrefetchOnly() {

content/public/renderer/render_view.h

@@ -22,10 +22,6 @@ class WebView;
 struct WebRect;
 }  // namespace blink
 
-namespace gfx {
-class Size;
-}
-
 namespace content {
 
 class RenderFrame;
@@ -62,9 +58,6 @@ class CONTENT_EXPORT RenderView : public IPC::Sender {
   // Get the routing ID of the view.
   virtual int GetRoutingID() = 0;
 
-  // Returns the size of the view.
-  virtual gfx::Size GetSize() = 0;
-
   // Returns the device scale factor of the display the render view is in.
   virtual float GetDeviceScaleFactor() = 0;
 

content/renderer/render_view_impl.cc

@@ -1882,10 +1882,6 @@ int RenderViewImpl::GetRoutingID() {
   return routing_id_;
 }
 
-gfx::Size RenderViewImpl::GetSize() {
-  return render_widget_->size();
-}
-
 float RenderViewImpl::GetDeviceScaleFactor() {
   return page_properties()->GetDeviceScaleFactor();
 }

content/renderer/render_view_impl.h

@@ -283,7 +283,6 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
   bool Send(IPC::Message* message) override;
   RenderFrameImpl* GetMainRenderFrame() override;
   int GetRoutingID() override;
-  gfx::Size GetSize() override;
   float GetDeviceScaleFactor() override;
   float GetZoomLevel() override;
   const WebPreferences& GetWebkitPreferences() override;

third_party/blink/public/web/web_view.h

@@ -310,6 +310,8 @@ class WebView {
   // settings.
   virtual void Resize(const WebSize&) = 0;
 
+  virtual WebSize GetSize() = 0;
+
   // Auto-Resize -----------------------------------------------------------
 
   // In auto-resize mode, the view is automatically adjusted to fit the html

third_party/blink/renderer/core/exported/web_view_impl.cc

@@ -1457,6 +1457,10 @@ void WebViewImpl::Resize(const WebSize& new_size) {
                             GetBrowserControls().ShrinkViewport());
 }
 
+WebSize WebViewImpl::GetSize() {
+  return size_;
+}
+
 void WebViewImpl::DidEnterFullscreen() {
   fullscreen_controller_->DidEnterFullscreen();
 }

third_party/blink/renderer/core/exported/web_view_impl.h

@@ -167,6 +167,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
   WebFloatSize VisualViewportSize() const override;
   void ResizeVisualViewport(const WebSize&) override;
   void Resize(const WebSize&) override;
+  WebSize GetSize() override;
   void ResetScrollAndScaleState() override;
   void SetIgnoreViewportTagScaleLimits(bool) override;
   WebSize ContentsPreferredMinimumSize() override;