Change Accessibility from using WebFloatRect to gfx::RectF.

Accessiblity can use gfx::RectF directly instead of using the
deprecated WebFloatRect.

Change-Id: I9ae67e219900bb4df7857a6d935280cc41966a0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2431794
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811427}

content/renderer/accessibility/blink_ax_action_target.cc

@@ -3,13 +3,12 @@
 // found in the LICENSE file.
 
 #include "content/renderer/accessibility/blink_ax_action_target.h"
-#include "third_party/blink/public/platform/web_float_rect.h"
 #include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
+#include "ui/gfx/geometry/rect_conversions.h"
 
 using blink::WebAXObject;
-using blink::WebFloatRect;
 using blink::WebRect;
 
 namespace content {
@@ -61,11 +60,11 @@ bool BlinkAXActionTarget::Focus() const {
 
 gfx::Rect BlinkAXActionTarget::GetRelativeBounds() const {
   blink::WebAXObject offset_container;
-  WebFloatRect bounds;
+  gfx::RectF bounds;
   SkMatrix44 container_transform;
   web_ax_object_.GetRelativeBounds(offset_container, bounds,
                                    container_transform);
-  return gfx::Rect(bounds.x, bounds.y, bounds.width, bounds.height);
+  return gfx::ToEnclosedRect(bounds);
 }
 
 gfx::Point BlinkAXActionTarget::GetScrollOffset() const {

content/renderer/accessibility/blink_ax_tree_source.cc

@@ -23,7 +23,6 @@
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_view_impl.h"
-#include "third_party/blink/public/platform/web_float_rect.h"
 #include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/platform/web_size.h"
 #include "third_party/blink/public/platform/web_string.h"
@@ -56,7 +55,6 @@ using blink::WebAXObjectAttribute;
 using blink::WebAXObjectVectorAttribute;
 using blink::WebDocument;
 using blink::WebElement;
-using blink::WebFloatRect;
 using blink::WebFrame;
 using blink::WebLocalFrame;
 using blink::WebNode;
@@ -418,7 +416,7 @@ void BlinkAXTreeSource::PopulateAXRelativeBounds(WebAXObject obj,
                                                  ui::AXRelativeBounds* bounds,
                                                  bool* clips_children) const {
   WebAXObject offset_container;
-  WebFloatRect bounds_in_container;
+  gfx::RectF bounds_in_container;
   SkMatrix44 web_container_transform;
   obj.GetRelativeBounds(offset_container, bounds_in_container,
                         web_container_transform, clips_children);
@@ -1366,13 +1364,13 @@ void BlinkAXTreeSource::AddImageAnnotations(blink::WebAXObject& src,
   // Skip images that are too small to label. This also catches
   // unloaded images where the size is unknown.
   WebAXObject offset_container;
-  WebFloatRect bounds;
+  gfx::RectF bounds;
   SkMatrix44 container_transform;
   bool clips_children = false;
   src.GetRelativeBounds(offset_container, bounds, container_transform,
                         &clips_children);
-  if (bounds.width < kMinImageAnnotationWidth ||
-      bounds.height < kMinImageAnnotationHeight) {
+  if (bounds.width() < kMinImageAnnotationWidth ||
+      bounds.height() < kMinImageAnnotationHeight) {
     dst->SetImageAnnotationStatus(
         ax::mojom::ImageAnnotationStatus::kIneligibleForAnnotation);
     return;

content/renderer/accessibility/render_accessibility_impl.cc

@@ -36,7 +36,6 @@
 #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "third_party/blink/public/platform/task_type.h"
-#include "third_party/blink/public/platform/web_float_rect.h"
 #include "third_party/blink/public/web/web_disallow_transition_scope.h"
 #include "third_party/blink/public/web/web_document.h"
 #include "third_party/blink/public/web/web_input_element.h"
@@ -53,7 +52,6 @@ using blink::WebAXContext;
 using blink::WebAXObject;
 using blink::WebDocument;
 using blink::WebElement;
-using blink::WebFloatRect;
 using blink::WebLocalFrame;
 using blink::WebNode;
 using blink::WebRect;

content/renderer/accessibility/render_accessibility_impl_browsertest.cc

@@ -41,7 +41,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
-#include "third_party/blink/public/platform/web_float_rect.h"
 #include "third_party/blink/public/platform/web_runtime_features.h"
 #include "third_party/blink/public/platform/web_size.h"
 #include "third_party/blink/public/web/web_ax_object.h"
@@ -1018,16 +1017,16 @@ TEST_F(BlinkAXActionTargetTest, TestMethods) {
   EXPECT_TRUE(input_range_action_target->Focus());
   EXPECT_TRUE(input_range.IsFocused());
 
-  blink::WebFloatRect expected_bounds;
+  gfx::RectF expected_bounds;
   blink::WebAXObject offset_container;
   SkMatrix44 container_transform;
   input_checkbox.GetRelativeBounds(offset_container, expected_bounds,
                                    container_transform);
   gfx::Rect actual_bounds = input_checkbox_action_target->GetRelativeBounds();
-  EXPECT_EQ(static_cast<int>(expected_bounds.x), actual_bounds.x());
-  EXPECT_EQ(static_cast<int>(expected_bounds.y), actual_bounds.y());
-  EXPECT_EQ(static_cast<int>(expected_bounds.width), actual_bounds.width());
-  EXPECT_EQ(static_cast<int>(expected_bounds.height), actual_bounds.height());
+  EXPECT_EQ(static_cast<int>(expected_bounds.x()), actual_bounds.x());
+  EXPECT_EQ(static_cast<int>(expected_bounds.y()), actual_bounds.y());
+  EXPECT_EQ(static_cast<int>(expected_bounds.width()), actual_bounds.width());
+  EXPECT_EQ(static_cast<int>(expected_bounds.height()), actual_bounds.height());
 
   gfx::Point offset_to_set(500, 500);
   scroller_action_target->SetScrollOffset(gfx::Point(500, 500));

third_party/blink/public/web/web_ax_object.h

@@ -44,6 +44,7 @@ class SkMatrix44;
 
 namespace gfx {
 class Point;
+class RectF;
 }
 
 namespace ui {
@@ -58,7 +59,6 @@ class WebNode;
 class WebDocument;
 class WebString;
 class WebURL;
-struct WebFloatRect;
 struct WebRect;
 struct WebSize;
 
@@ -397,7 +397,7 @@ class WebAXObject {
   // If the container clips its children, for example with overflow:hidden
   // or similar, set |clips_children| to true.
   BLINK_EXPORT void GetRelativeBounds(WebAXObject& offset_container,
-                                      WebFloatRect& bounds_in_container,
+                                      gfx::RectF& bounds_in_container,
                                       SkMatrix44& container_transform,
                                       bool* clips_children = nullptr) const;
 

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

@@ -30,7 +30,6 @@
 
 #include "third_party/blink/public/web/web_ax_object.h"
 
-#include "third_party/blink/public/platform/web_float_rect.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_url.h"
@@ -1504,7 +1503,7 @@ void WebAXObject::Dropeffects(
 }
 
 void WebAXObject::GetRelativeBounds(WebAXObject& offset_container,
-                                    WebFloatRect& bounds_in_container,
+                                    gfx::RectF& bounds_in_container,
                                     SkMatrix44& container_transform,
                                     bool* clips_children) const {
   if (IsDetached())
@@ -1519,7 +1518,7 @@ void WebAXObject::GetRelativeBounds(WebAXObject& offset_container,
   private_->GetRelativeBounds(&container, bounds, container_transform,
                               clips_children);
   offset_container = WebAXObject(container);
-  bounds_in_container = WebFloatRect(bounds);
+  bounds_in_container = gfx::RectF(bounds);
 }
 
 void WebAXObject::GetAllObjectsWithChangedBounds(