Remove WebRect from WebDraggableRegion and CapturePaintPreview.

A few more removals with respect to conversions from WebRect->gfx::Rect.

BUG=738465

Change-Id: I93c62c173fa3788a2354f2c3406d58bdc5469e3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639230
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846328}

components/page_load_metrics/renderer/page_timing_metrics_sender.cc

@@ -232,9 +232,9 @@ void PageTimingMetricsSender::DidLoadResourceFromMemoryCache(
 }
 
 void PageTimingMetricsSender::OnMainFrameIntersectionChanged(
-    const blink::WebRect& main_frame_intersection) {
+    const gfx::Rect& main_frame_intersection) {
   metadata_->intersection_update =
-      mojom::FrameIntersectionUpdate::New(gfx::Rect(main_frame_intersection));
+      mojom::FrameIntersectionUpdate::New(main_frame_intersection);
   EnsureSendTimer();
 }
 

components/page_load_metrics/renderer/page_timing_metrics_sender.h

@@ -73,7 +73,7 @@ class PageTimingMetricsSender {
                                       int request_id,
                                       int64_t encoded_body_length,
                                       const std::string& mime_type);
-  void OnMainFrameIntersectionChanged(const blink::WebRect& intersect_rect);
+  void OnMainFrameIntersectionChanged(const gfx::Rect& intersect_rect);
 
   void DidObserveInputDelay(base::TimeDelta input_delay);
   // Updates the timing information. Buffers |timing| to be sent over mojo

components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc

@@ -439,7 +439,7 @@ TEST_F(PageTimingMetricsSenderTest, SendFrameIntersectionUpdate) {
                           PageTimingMetadataRecorder::MonotonicTiming());
   validator_.ExpectPageLoadTiming(timing);
 
-  metrics_sender_->OnMainFrameIntersectionChanged(blink::WebRect(0, 0, 1, 1));
+  metrics_sender_->OnMainFrameIntersectionChanged(gfx::Rect(0, 0, 1, 1));
   mojom::FrameIntersectionUpdate frame_intersection_update(
       gfx::Rect(0, 0, 1, 1));
   validator_.UpdateExpectFrameIntersectionUpdate(frame_intersection_update);

content/public/renderer/render_frame.h

@@ -43,11 +43,11 @@ class WebFrame;
 class WebLocalFrame;
 class WebPlugin;
 struct WebPluginParams;
-struct WebRect;
 }  // namespace blink
 
 namespace gfx {
 class Range;
+class Rect;
 class RectF;
 }  // namespace gfx
 
@@ -295,7 +295,7 @@ class CONTENT_EXPORT RenderFrame : public IPC::Listener,
 
   // Converts the |rect| to Window coordinates which are device scale
   // independent.
-  virtual void ConvertViewportToWindow(blink::WebRect* rect) = 0;
+  virtual void ConvertViewportToWindow(gfx::Rect* rect) = 0;
 
   // Returns the device scale factor of the display the render frame is in.
   virtual float GetDeviceScaleFactor() = 0;

content/renderer/render_frame_impl.cc

@@ -6341,7 +6341,7 @@ gfx::RectF RenderFrameImpl::ElementBoundsInWindow(
       element.BoundsInViewport()));
 }
 
-void RenderFrameImpl::ConvertViewportToWindow(blink::WebRect* rect) {
+void RenderFrameImpl::ConvertViewportToWindow(gfx::Rect* rect) {
   *rect = GetLocalRootWebFrameWidget()->BlinkSpaceToEnclosedDIPs(*rect);
 }
 

content/renderer/render_frame_impl.h

@@ -396,7 +396,7 @@ class CONTENT_EXPORT RenderFrameImpl
       const RenderFrameMediaPlaybackOptions& opts) override;
   void SetAllowsCrossBrowsingInstanceFrameLookup() override;
   gfx::RectF ElementBoundsInWindow(const blink::WebElement& element) override;
-  void ConvertViewportToWindow(blink::WebRect* rect) override;
+  void ConvertViewportToWindow(gfx::Rect* rect) override;
   float GetDeviceScaleFactor() override;
 
   // blink::mojom::AutoplayConfigurationClient implementation:

content/renderer/render_view_browsertest.cc

@@ -509,7 +509,10 @@ class RenderViewImplTest : public RenderViewTest {
   int GetScrollbarWidth() {
     blink::WebView* webview = view()->GetWebView();
     return webview->MainFrameWidget()->Size().width() -
-           webview->MainFrame()->ToWebLocalFrame()->VisibleContentRect().width;
+           webview->MainFrame()
+               ->ToWebLocalFrame()
+               ->VisibleContentRect()
+               .width();
   }
 
  private:

third_party/blink/public/web/web_content_holder.h

@@ -7,10 +7,13 @@
 
 #include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_private_ptr.h"
-#include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_vector.h"
 
+namespace gfx {
+class Rect;
+}  // namespace gfx
+
 namespace blink {
 
 class ContentHolder;
@@ -23,7 +26,7 @@ class BLINK_EXPORT WebContentHolder {
   virtual ~WebContentHolder();
 
   WebString GetValue() const;
-  WebRect GetBoundingBox() const;
+  gfx::Rect GetBoundingBox() const;
   uint64_t GetId() const;
 
 #if INSIDE_BLINK

third_party/blink/public/web/web_draggable_region.h

@@ -31,15 +31,13 @@
 #ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DRAGGABLE_REGION_H_
 #define THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_DRAGGABLE_REGION_H_
 
-#include "third_party/blink/public/platform/web_common.h"
-#include "third_party/blink/public/platform/web_rect.h"
-#include "third_party/blink/public/platform/web_string.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace blink {
 
 struct WebDraggableRegion {
   bool draggable;
-  WebRect bounds;
+  gfx::Rect bounds;
 };
 
 }  // namespace blink

third_party/blink/public/web/web_local_frame.h

@@ -670,7 +670,7 @@ class WebLocalFrame : public WebFrame {
 
   // Returns the visible content rect (minus scrollbars), relative to the
   // document.
-  virtual WebRect VisibleContentRect() const = 0;
+  virtual gfx::Rect VisibleContentRect() const = 0;
 
   // Printing ------------------------------------------------------------
 
@@ -722,7 +722,7 @@ class WebLocalFrame : public WebFrame {
   // Captures a full frame paint preview of the WebFrame including subframes. If
   // |include_linked_destinations| is true, the capture will include annotations
   // about linked destinations within the document.
-  virtual bool CapturePaintPreview(const WebRect& bounds,
+  virtual bool CapturePaintPreview(const gfx::Rect& bounds,
                                    cc::PaintCanvas* canvas,
                                    bool include_linked_destinations) = 0;
 

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

@@ -27,8 +27,8 @@ WebString WebContentHolder::GetValue() const {
   return private_->node()->nodeValue();
 }
 
-WebRect WebContentHolder::GetBoundingBox() const {
-  return WebRect(private_->rect());
+gfx::Rect WebContentHolder::GetBoundingBox() const {
+  return private_->rect();
 }
 
 uint64_t WebContentHolder::GetId() const {

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

@@ -819,10 +819,10 @@ bool WebLocalFrameImpl::HasVisibleContent() const {
   return false;
 }
 
-WebRect WebLocalFrameImpl::VisibleContentRect() const {
+gfx::Rect WebLocalFrameImpl::VisibleContentRect() const {
   if (LocalFrameView* view = GetFrameView())
     return view->LayoutViewport()->VisibleContentRect();
-  return WebRect();
+  return gfx::Rect();
 }
 
 WebView* WebLocalFrameImpl::View() const {
@@ -1739,10 +1739,10 @@ bool WebLocalFrameImpl::GetPrintPresetOptionsForPlugin(
   return plugin_container->GetPrintPresetOptionsFromDocument(preset_options);
 }
 
-bool WebLocalFrameImpl::CapturePaintPreview(const WebRect& bounds,
+bool WebLocalFrameImpl::CapturePaintPreview(const gfx::Rect& bounds,
                                             cc::PaintCanvas* canvas,
                                             bool include_linked_destinations) {
-  FloatSize float_bounds(bounds.width, bounds.height);
+  FloatSize float_bounds(bounds.width(), bounds.height());
   bool success = false;
   {
     Document::PaintPreviewScope paint_preview(*GetFrame()->GetDocument());

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

@@ -277,7 +277,7 @@ class CORE_EXPORT WebLocalFrameImpl final
   void SetScrollOffset(const WebSize&) override;
   WebSize DocumentSize() const override;
   bool HasVisibleContent() const override;
-  WebRect VisibleContentRect() const override;
+  gfx::Rect VisibleContentRect() const override;
   void DispatchBeforePrintEvent(
       base::WeakPtr<WebPrintClient> print_client) override;
   WebPlugin* GetPluginToPrint(const WebNode& constrain_to_node) override;
@@ -289,7 +289,7 @@ class CORE_EXPORT WebLocalFrameImpl final
   void DispatchAfterPrintEvent() override;
   bool GetPrintPresetOptionsForPlugin(const WebNode&,
                                       WebPrintPresetOptions*) override;
-  bool CapturePaintPreview(const WebRect& bounds,
+  bool CapturePaintPreview(const gfx::Rect& bounds,
                            cc::PaintCanvas* canvas,
                            bool include_linked_destinations) override;
   bool ShouldSuppressKeyboardForFocusedElement() override;

third_party/blink/renderer/core/paint/video_painter_test.cc

@@ -185,7 +185,7 @@ TEST_P(VideoPaintPreviewTest, URLIsRecordedWhenPaintingPreview) {
       recorder.beginRecording(bounds().width(), bounds().height());
   canvas->SetPaintPreviewTracker(&tracker);
 
-  GetLocalMainFrame().CapturePaintPreview(WebRect(bounds()), canvas,
+  GetLocalMainFrame().CapturePaintPreview(bounds(), canvas,
                                           /*include_linked_destinations=*/true);
   auto record = recorder.finishRecordingAsPicture();
   std::vector<std::pair<GURL, SkRect>> links;