More WebRect/WebSize removal from Accessibility.

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

BUG=738465

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

components/page_load_metrics/renderer/metrics_render_frame_observer.cc

@@ -375,7 +375,7 @@ void MetricsRenderFrameObserver::OnAdResourceObserved(int request_id) {
 }
 
 void MetricsRenderFrameObserver::OnMainFrameIntersectionChanged(
-    const blink::WebRect& main_frame_intersection) {
+    const gfx::Rect& main_frame_intersection) {
   if (page_timing_metrics_sender_)
     page_timing_metrics_sender_->OnMainFrameIntersectionChanged(
         main_frame_intersection);

components/page_load_metrics/renderer/metrics_render_frame_observer.h

@@ -17,7 +17,6 @@
 #include "content/public/renderer/render_frame_observer.h"
 #include "third_party/blink/public/common/loader/loading_behavior_flag.h"
 #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
-#include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/web/web_local_frame_client.h"
 
 class GURL;
@@ -99,7 +98,7 @@ class MetricsRenderFrameObserver
   void OnAdResourceObserved(int request_id) override;
 
   void OnMainFrameIntersectionChanged(
-      const blink::WebRect& main_frame_intersection) override;
+      const gfx::Rect& main_frame_intersection) override;
   void OnMobileFriendlinessChanged(const blink::MobileFriendliness&) override;
 
   bool SetUpSmoothnessReporting(

content/public/renderer/render_frame_observer.h

@@ -45,6 +45,10 @@ namespace network {
 struct URLLoaderCompletionStatus;
 }  // namespace network
 
+namespace gfx {
+class Rect;
+}  // namespace gfx
+
 namespace content {
 
 class RendererPpapiHost;
@@ -264,8 +268,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   virtual void WillCreateWorkerFetchContext(blink::WebWorkerFetchContext*) {}
 
   // Called when a frame's intersection with the main frame changes.
-  virtual void OnMainFrameIntersectionChanged(
-      const blink::WebRect& intersect_rect) {}
+  virtual void OnMainFrameIntersectionChanged(const gfx::Rect& intersect_rect) {
+  }
 
   // Overlay-popup-ad violates The Better Ads Standards
   // (https://www.betterads.org/standards/). This method will be called when an

content/renderer/render_frame_impl_browsertest.cc

@@ -196,16 +196,16 @@ class RenderFrameTestObserver : public RenderFrameObserver {
   void WasHidden() override { visible_ = false; }
   void OnDestruct() override { delete this; }
   void OnMainFrameIntersectionChanged(
-      const blink::WebRect& intersection_rect) override {
+      const gfx::Rect& intersection_rect) override {
     last_intersection_rect_ = intersection_rect;
   }
 
   bool visible() { return visible_; }
-  blink::WebRect last_intersection_rect() { return last_intersection_rect_; }
+  gfx::Rect last_intersection_rect() { return last_intersection_rect_; }
 
  private:
   bool visible_;
-  blink::WebRect last_intersection_rect_;
+  gfx::Rect last_intersection_rect_;
 };
 
 // Verify that a frame with a RenderFrameProxy as a parent has its own
@@ -437,7 +437,7 @@ TEST_F(RenderFrameImplTest, MainFrameIntersectionRecorded) {
   frame()->OnMainFrameIntersectionChanged(mainframe_intersection);
   // Setting a new frame intersection in a local frame triggers the render frame
   // observer call.
-  EXPECT_EQ(observer.last_intersection_rect(), blink::WebRect(0, 0, 200, 140));
+  EXPECT_EQ(observer.last_intersection_rect(), mainframe_intersection);
 }
 
 // Used to annotate the source of an interface request.

third_party/blink/public/web/web_ax_object.h

@@ -34,7 +34,6 @@
 #include <memory>
 #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_size.h"
 #include "third_party/blink/public/platform/web_vector.h"
 #include "third_party/blink/public/web/web_ax_enums.h"
 #include "ui/accessibility/ax_enums.mojom-shared.h"
@@ -45,6 +44,8 @@ class SkMatrix44;
 namespace gfx {
 class Point;
 class RectF;
+class Rect;
+class Size;
 }
 
 namespace ui {
@@ -59,8 +60,6 @@ class WebNode;
 class WebDocument;
 class WebString;
 class WebURL;
-struct WebRect;
-struct WebSize;
 
 // A container for passing around a reference to AXObject.
 class WebAXObject {
@@ -164,15 +163,15 @@ class WebAXObject {
   BLINK_EXPORT bool CanvasHasFallbackContent() const;
   BLINK_EXPORT WebAXObject ErrorMessage() const;
   // If this is an image, returns the image (scaled to maxSize) as a data url.
-  BLINK_EXPORT WebString ImageDataUrl(const WebSize& max_size) const;
+  BLINK_EXPORT WebString ImageDataUrl(const gfx::Size& max_size) const;
   BLINK_EXPORT ax::mojom::InvalidState InvalidState() const;
   // Only used when invalidState() returns WebAXInvalidStateOther.
   BLINK_EXPORT WebString AriaInvalidValue() const;
   BLINK_EXPORT int HeadingLevel() const;
   BLINK_EXPORT int HierarchicalLevel() const;
   BLINK_EXPORT WebAXObject HitTest(const gfx::Point&) const;
-  // Get the WebAXObject's bounds in frame-relative coordinates as a WebRect.
-  BLINK_EXPORT WebRect GetBoundsInFrameCoordinates() const;
+  // Get the WebAXObject's bounds in frame-relative coordinates as a gfx::Rect.
+  BLINK_EXPORT gfx::Rect GetBoundsInFrameCoordinates() const;
   BLINK_EXPORT WebString KeyboardShortcut() const;
   BLINK_EXPORT WebString Language() const;
   BLINK_EXPORT WebAXObject InPageLinkTarget() const;
@@ -279,7 +278,7 @@ class WebAXObject {
   // in local coordinates. We also allow passing horizontal and vertical scroll
   // alignments. These specify where in the content area to scroll the object.
   BLINK_EXPORT bool ScrollToMakeVisibleWithSubFocus(
-      const WebRect&,
+      const gfx::Rect&,
       ax::mojom::ScrollAlignment horizontal_scroll_alignment =
           ax::mojom::ScrollAlignment::kScrollAlignmentCenter,
       ax::mojom::ScrollAlignment vertical_scroll_alignment =

third_party/blink/renderer/modules/exported/web_ax_object.cc

@@ -475,11 +475,11 @@ bool WebAXObject::CanvasHasFallbackContent() const {
   return private_->CanvasHasFallbackContent();
 }
 
-WebString WebAXObject::ImageDataUrl(const WebSize& max_size) const {
+WebString WebAXObject::ImageDataUrl(const gfx::Size& max_size) const {
   if (IsDetached())
     return WebString();
 
-  return private_->ImageDataUrl(max_size);
+  return private_->ImageDataUrl(IntSize(max_size));
 }
 
 ax::mojom::InvalidState WebAXObject::InvalidState() const {
@@ -543,9 +543,9 @@ WebAXObject WebAXObject::HitTest(const gfx::Point& point) const {
   return WebAXObject();
 }
 
-WebRect WebAXObject::GetBoundsInFrameCoordinates() const {
+gfx::Rect WebAXObject::GetBoundsInFrameCoordinates() const {
   LayoutRect rect = private_->GetBoundsInFrameCoordinates();
-  return WebRect(EnclosingIntRect(rect));
+  return EnclosingIntRect(rect);
 }
 
 WebString WebAXObject::KeyboardShortcut() const {
@@ -1322,7 +1322,7 @@ bool WebAXObject::ScrollToMakeVisible() const {
 }
 
 bool WebAXObject::ScrollToMakeVisibleWithSubFocus(
-    const WebRect& subfocus,
+    const gfx::Rect& subfocus,
     ax::mojom::ScrollAlignment horizontal_scroll_alignment,
     ax::mojom::ScrollAlignment vertical_scroll_alignment,
     ax::mojom::ScrollBehavior scroll_behavior) const {
@@ -1349,7 +1349,7 @@ bool WebAXObject::ScrollToMakeVisibleWithSubFocus(
   blink::mojom::blink::ScrollAlignment blink_vertical_scroll_alignment = {
       visible_vertical_behavior, vertical_behavior, vertical_behavior};
   return private_->RequestScrollToMakeVisibleWithSubFocusAction(
-      subfocus, blink_horizontal_scroll_alignment,
+      IntRect(subfocus), blink_horizontal_scroll_alignment,
       blink_vertical_scroll_alignment);
 }