[AXOnionSoup] Move scroll serialization to AXObject

This patch has no functional difference, it is just a refactor.

AX-Relnotes: N/A
Bug: 1068668
Change-Id: Iedaefa7d8b06ac80d7155739e134978bdb674d29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577389
Commit-Queue: Meredith Lane <meredithl@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841259}

content/renderer/accessibility/blink_ax_tree_source.cc

@@ -552,10 +552,6 @@ void BlinkAXTreeSource::SerializeNode(WebAXObject src,
                              indirect_child_ids);
   }
 
-  if (src.IsScrollableContainer()) {
-    SerializeScrollAttributes(src, dst);
-  }
-
   if (dst->id == image_data_node_id_) {
     // In general, string attributes should be truncated using
     // TruncateAndAddStringAttribute, but ImageDataUrl contains a data url
@@ -705,30 +701,6 @@ void BlinkAXTreeSource::SerializeLiveRegionAttributes(
       src.ContainerLiveRegionRelevant().Utf8());
 }
 
-void BlinkAXTreeSource::SerializeScrollAttributes(WebAXObject src,
-                                                  ui::AXNodeData* dst) const {
-  // Only mark as scrollable if user has actual scrollbars to use.
-  dst->AddBoolAttribute(ax::mojom::BoolAttribute::kScrollable,
-                        src.IsUserScrollable());
-  // Provide x,y scroll info if scrollable in any way (programmatically or via
-  // user).
-  const gfx::Point& scroll_offset = src.GetScrollOffset();
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollX, scroll_offset.x());
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollY, scroll_offset.y());
-
-  const gfx::Point& min_scroll_offset = src.MinimumScrollOffset();
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollXMin,
-                       min_scroll_offset.x());
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollYMin,
-                       min_scroll_offset.y());
-
-  const gfx::Point& max_scroll_offset = src.MaximumScrollOffset();
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollXMax,
-                       max_scroll_offset.x());
-  dst->AddIntAttribute(ax::mojom::IntAttribute::kScrollYMax,
-                       max_scroll_offset.y());
-}
-
 void BlinkAXTreeSource::SerializeChooserPopupAttributes(
     WebAXObject src,
     ui::AXNodeData* dst) const {

content/renderer/accessibility/blink_ax_tree_source.h

@@ -144,8 +144,6 @@ class CONTENT_EXPORT BlinkAXTreeSource
                                  ui::AXNodeData* dst) const;
   void SerializeLiveRegionAttributes(blink::WebAXObject src,
                                      ui::AXNodeData* dst) const;
-  void SerializeScrollAttributes(blink::WebAXObject src,
-                                 ui::AXNodeData* dst) const;
   void SerializeChooserPopupAttributes(blink::WebAXObject src,
                                        ui::AXNodeData* dst) const;
   void SerializeOtherScreenReaderAttributes(blink::WebAXObject src,

content/web_test/renderer/web_ax_object_proxy.cc

@@ -1459,12 +1459,12 @@ void WebAXObjectProxy::ScrollToGlobalPoint(int x, int y) {
 
 int WebAXObjectProxy::ScrollX() {
   UpdateLayout();
-  return accessibility_object_.GetScrollOffset().x();
+  return GetAXNodeData().GetIntAttribute(ax::mojom::IntAttribute::kScrollX);
 }
 
 int WebAXObjectProxy::ScrollY() {
   UpdateLayout();
-  return accessibility_object_.GetScrollOffset().y();
+  return GetAXNodeData().GetIntAttribute(ax::mojom::IntAttribute::kScrollY);
 }
 
 std::string WebAXObjectProxy::ToString() {

third_party/blink/public/web/web_ax_object.h

@@ -333,7 +333,6 @@ class WebAXObject {
   // Programmatically scrollable.
   BLINK_EXPORT bool IsScrollableContainer() const;
   // Also scrollable by user.
-  BLINK_EXPORT bool IsUserScrollable() const;
   BLINK_EXPORT gfx::Point GetScrollOffset() const;
   BLINK_EXPORT gfx::Point MinimumScrollOffset() const;
   BLINK_EXPORT gfx::Point MaximumScrollOffset() const;

third_party/blink/renderer/modules/accessibility/ax_object.cc

@@ -961,6 +961,9 @@ void AXObject::Serialize(ui::AXNodeData* node_data,
       }
     }
   }
+
+  if (IsScrollableContainer())
+    SerializeScrollAttributes(node_data);
 }
 
 void AXObject::SerializeTableAttributes(ui::AXNodeData* node_data) {
@@ -1018,6 +1021,31 @@ void AXObject::SerializeTableAttributes(ui::AXNodeData* node_data) {
   }
 }
 
+void AXObject::SerializeScrollAttributes(ui::AXNodeData* node_data) {
+  // Only mark as scrollable if user has actual scrollbars to use.
+  node_data->AddBoolAttribute(ax::mojom::blink::BoolAttribute::kScrollable,
+                              IsUserScrollable());
+  // Provide x,y scroll info if scrollable in any way (programmatically or via
+  // user).
+  const gfx::Point& scroll_offset = GetScrollOffset();
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollX,
+                             scroll_offset.x());
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollY,
+                             scroll_offset.y());
+
+  const gfx::Point& min_scroll_offset = MinimumScrollOffset();
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollXMin,
+                             min_scroll_offset.x());
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollYMin,
+                             min_scroll_offset.y());
+
+  const gfx::Point& max_scroll_offset = MaximumScrollOffset();
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollXMax,
+                             max_scroll_offset.x());
+  node_data->AddIntAttribute(ax::mojom::blink::IntAttribute::kScrollYMax,
+                             max_scroll_offset.y());
+}
+
 void AXObject::SerializeStyleAttributes(ui::AXNodeData* node_data) {
   // Text attributes.
   if (BackgroundColor()) {

third_party/blink/renderer/modules/accessibility/ax_object.h

@@ -1316,6 +1316,7 @@ class MODULES_EXPORT AXObject : public GarbageCollected<AXObject> {
   void SerializeSparseAttributes(ui::AXNodeData* node_data);
   void SerializeTableAttributes(ui::AXNodeData* node_data);
   void SerializeListAttributes(ui::AXNodeData* node_data);
+  void SerializeScrollAttributes(ui::AXNodeData* node_data);
 
  private:
   void UpdateDistributionForFlatTreeTraversal() const;

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

@@ -1238,12 +1238,6 @@ bool WebAXObject::IsScrollableContainer() const {
   return private_->IsScrollableContainer();
 }
 
-bool WebAXObject::IsUserScrollable() const {
-  if (IsDetached())
-    return false;
-
-  return private_->IsUserScrollable();
-}
 gfx::Point WebAXObject::GetScrollOffset() const {
   if (IsDetached())
     return gfx::Point();