[A11y] Pass in parent when creating AXObject for popup document

In general, it's better to supply the parent when creating AXObjects. In cases where it isn't supplied, we have to try to repair the local included subtree. Necessary for landing CL:4873421, which is a refactoring of how we do repairs. Bug: none Change-Id: I2f70edf95074d79bdc5ddad215d4b6f73dfb9bf6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4969292 Reviewed-by: Chris Harrelson <chrishtr@chromium.org> Commit-Queue: Aaron Leventhal <aleventhal@chromium.org> Cr-Commit-Position: refs/heads/main@{#1216763}
chromium · Oct 30, 2023 · 9f8b3b4 · 9f8b3b4
1 parent a1f3352
commit 9f8b3b4
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 26 deletions.
diff --git a/third_party/blink/renderer/core/accessibility/ax_object_cache_base.h b/third_party/blink/renderer/core/accessibility/ax_object_cache_base.h
@@ -11,7 +11,6 @@
 
 namespace blink {
 
-class LayoutObject;
 class AXObject;
 
 // AXObjectCacheBase is a temporary class that sits between AXObjectCache and
@@ -26,9 +25,11 @@ class CORE_EXPORT AXObjectCacheBase : public AXObjectCache {
   AXObjectCacheBase& operator=(const AXObjectCacheBase&) = delete;
   ~AXObjectCacheBase() override = default;
 
-  virtual AXObject* GetOrCreate(LayoutObject*,
+  virtual AXObject* GetOrCreate(const Node*,
                                 AXObject* parent_if_known = nullptr) = 0;
 
+  virtual AXObject* Get(const Node*) = 0;
+
  protected:
   AXObjectCacheBase() = default;
 };

diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.cc b/third_party/blink/renderer/core/exported/web_page_popup_impl.cc
@@ -573,17 +573,17 @@ void WebPagePopupImpl::DestroyPage() {
   page_.Clear();
 }
 
-AXObject* WebPagePopupImpl::RootAXObject() {
+AXObject* WebPagePopupImpl::RootAXObject(Element* popup_owner) {
   if (!page_)
     return nullptr;
   // If |page_| is non-null, the main frame must have a Document.
   Document* document = MainFrame().GetDocument();
-  AXObjectCache* cache = document->ExistingAXObjectCache();
+  AXObjectCacheBase* cache =
+      To<AXObjectCacheBase>(document->ExistingAXObjectCache());
   // There should never be a circumstance when RootAXObject() is triggered
   // and the AXObjectCache doesn't already exist. It's called when trying
   // to attach the accessibility tree of the pop-up to the host page.
-  DCHECK(cache);
-  return To<AXObjectCacheBase>(cache)->GetOrCreate(document->GetLayoutView());
+  return cache->GetOrCreate(document, cache->Get(popup_owner));
 }
 
 void WebPagePopupImpl::SetWindowRect(const gfx::Rect& rect_in_screen) {

diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.h b/third_party/blink/renderer/core/exported/web_page_popup_impl.h
@@ -222,7 +222,7 @@ class CORE_EXPORT WebPagePopupImpl final : public WebPagePopup,
   gfx::Rect GetAnchorRectInScreen() const;
 
   // PagePopup function
-  AXObject* RootAXObject() override;
+  AXObject* RootAXObject(Element* popover_owner) override;
   void SetWindowRect(const gfx::Rect&) override;
 
   WebPagePopupImpl(

diff --git a/third_party/blink/renderer/core/html/forms/color_chooser.h b/third_party/blink/renderer/core/html/forms/color_chooser.h
@@ -36,6 +36,7 @@
 namespace blink {
 
 class AXObject;
+class Element;
 class Color;
 
 // This interface respresents a UI to choose a color.
@@ -51,7 +52,7 @@ class CORE_EXPORT ColorChooser : public GarbageCollectedMixin {
   // Call to close the UI.
   virtual void EndChooser() {}
   // Returns a root AXObject in the ColorChooser if it's available.
-  virtual AXObject* RootAXObject() = 0;
+  virtual AXObject* RootAXObject(Element* popup_owner) = 0;
 };
 
 }  // namespace blink

diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc b/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc
@@ -78,8 +78,8 @@ void ColorChooserPopupUIController::EndChooser() {
   CancelPopup();
 }
 
-AXObject* ColorChooserPopupUIController::RootAXObject() {
-  return popup_ ? popup_->RootAXObject() : nullptr;
+AXObject* ColorChooserPopupUIController::RootAXObject(Element* popup_owner) {
+  return popup_ ? popup_->RootAXObject(popup_owner) : nullptr;
 }
 
 void ColorChooserPopupUIController::WriteDocument(SharedBuffer* data) {

diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h b/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.h
@@ -55,7 +55,7 @@ class CORE_EXPORT ColorChooserPopupUIController final
 
   // ColorChooser functions
   void EndChooser() override;
-  AXObject* RootAXObject() override;
+  AXObject* RootAXObject(Element* popup_owner) override;
 
   // PagePopupClient functions:
   void WriteDocument(SharedBuffer*) override;

diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc
@@ -76,7 +76,7 @@ void ColorChooserUIController::EndChooser() {
   client_->DidEndChooser();
 }
 
-AXObject* ColorChooserUIController::RootAXObject() {
+AXObject* ColorChooserUIController::RootAXObject(Element* popup_owner) {
   return nullptr;
 }
 

diff --git a/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h b/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h
@@ -58,7 +58,7 @@ class CORE_EXPORT ColorChooserUIController
   // ColorChooser functions:
   void SetSelectedColor(const Color&) final;
   void EndChooser() override;
-  AXObject* RootAXObject() override;
+  AXObject* RootAXObject(Element* popup_owner) override;
 
   // mojom::blink::ColorChooserClient functions:
   void DidChooseColor(uint32_t color) final;

diff --git a/third_party/blink/renderer/core/html/forms/color_input_type.cc b/third_party/blink/renderer/core/html/forms/color_input_type.cc
@@ -292,7 +292,7 @@ Vector<mojom::blink::ColorSuggestionPtr> ColorInputType::Suggestions() const {
 }
 
 AXObject* ColorInputType::PopupRootAXObject() {
-  return chooser_ ? chooser_->RootAXObject() : nullptr;
+  return chooser_ ? chooser_->RootAXObject(&GetElement()) : nullptr;
 }
 
 ColorChooserClient* ColorInputType::GetColorChooserClient() {

diff --git a/third_party/blink/renderer/core/html/forms/date_time_chooser.h b/third_party/blink/renderer/core/html/forms/date_time_chooser.h
@@ -42,6 +42,7 @@
 namespace blink {
 
 class AXObject;
+class Element;
 
 struct DateTimeChooserParameters {
   DISALLOW_NEW();
@@ -87,7 +88,7 @@ class CORE_EXPORT DateTimeChooser : public GarbageCollected<DateTimeChooser> {
 
   virtual void EndChooser() = 0;
   // Returns a root AXObject in the DateTimeChooser if it's available.
-  virtual AXObject* RootAXObject() = 0;
+  virtual AXObject* RootAXObject(Element* popup_owner) = 0;
 
   virtual void Trace(Visitor* visitor) const {}
 };

diff --git a/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc b/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc
@@ -81,8 +81,8 @@ void DateTimeChooserImpl::EndChooser() {
   frame_->View()->GetChromeClient()->ClosePagePopup(popup_);
 }
 
-AXObject* DateTimeChooserImpl::RootAXObject() {
-  return popup_ ? popup_->RootAXObject() : nullptr;
+AXObject* DateTimeChooserImpl::RootAXObject(Element* popup_owner) {
+  return popup_ ? popup_->RootAXObject(popup_owner) : nullptr;
 }
 
 static String ValueToDateTimeString(double value, InputType::Type type) {

diff --git a/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h b/third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h
@@ -55,7 +55,7 @@ class CORE_EXPORT DateTimeChooserImpl final : public DateTimeChooser,
 
   // DateTimeChooser functions:
   void EndChooser() override;
-  AXObject* RootAXObject() override;
+  AXObject* RootAXObject(Element* popup_owner) override;
 
   void Trace(Visitor*) const override;
 

diff --git a/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc b/third_party/blink/renderer/core/html/forms/external_date_time_chooser.cc
@@ -156,7 +156,7 @@ void ExternalDateTimeChooser::EndChooser() {
   client->DidEndChooser();
 }
 
-AXObject* ExternalDateTimeChooser::RootAXObject() {
+AXObject* ExternalDateTimeChooser::RootAXObject(Element* popup_owner) {
   return nullptr;
 }
 

diff --git a/third_party/blink/renderer/core/html/forms/external_date_time_chooser.h b/third_party/blink/renderer/core/html/forms/external_date_time_chooser.h
@@ -35,6 +35,7 @@ namespace blink {
 
 class DateTimeChooserClient;
 class LocalFrame;
+class Element;
 
 class CORE_EXPORT ExternalDateTimeChooser final : public DateTimeChooser {
  public:
@@ -55,7 +56,7 @@ class CORE_EXPORT ExternalDateTimeChooser final : public DateTimeChooser {
 
   // DateTimeChooser function:
   void EndChooser() override;
-  AXObject* RootAXObject() override;
+  AXObject* RootAXObject(Element* popup_owner) override;
 
   mojom::blink::DateTimeChooser& GetDateTimeChooser(LocalFrame* frame);
 

diff --git a/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc b/third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
@@ -645,7 +645,7 @@ void InternalPopupMenu::UpdateFromElement(UpdateReason) {
 }
 
 AXObject* InternalPopupMenu::PopupRootAXObject() const {
-  return popup_ ? popup_->RootAXObject() : nullptr;
+  return popup_ ? popup_->RootAXObject(owner_element_) : nullptr;
 }
 
 void InternalPopupMenu::Update(bool force_update) {

diff --git a/third_party/blink/renderer/core/html/forms/picker_indicator_element.cc b/third_party/blink/renderer/core/html/forms/picker_indicator_element.cc
@@ -152,7 +152,7 @@ void PickerIndicatorElement::DetachLayoutTree(bool performing_reattach) {
 }
 
 AXObject* PickerIndicatorElement::PopupRootAXObject() const {
-  return chooser_ ? chooser_->RootAXObject() : nullptr;
+  return chooser_ ? chooser_->RootAXObject(&OwnerElement()) : nullptr;
 }
 
 bool PickerIndicatorElement::IsPickerIndicatorElement() const {

diff --git a/third_party/blink/renderer/core/page/page_popup.h b/third_party/blink/renderer/core/page/page_popup.h
@@ -40,12 +40,13 @@ class Rect;
 namespace blink {
 
 class AXObject;
+class Element;
 
 // A PagePopup object is created by ChromeClient::openPagePopup(), and deleted
 // by ChromeClient::closePagePopup().
 class PagePopup {
  public:
-  virtual AXObject* RootAXObject() = 0;
+  virtual AXObject* RootAXObject(Element* popup_owner) = 0;
   virtual void SetWindowRect(const gfx::Rect&) = 0;
   virtual void PostMessageToPopup(const String& message) = 0;
   virtual void Update() = 0;

diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h
@@ -328,9 +328,9 @@ class MODULES_EXPORT AXObjectCacheImpl
   // be created. For instance, not all HTMLElements can have an AXObject,
   // such as <head> or <script> tags.
   AXObject* GetOrCreate(AccessibleNode*, AXObject* parent);
-  AXObject* GetOrCreate(LayoutObject*, AXObject* parent_if_known) override;
+  AXObject* GetOrCreate(LayoutObject*, AXObject* parent_if_known);
   AXObject* GetOrCreate(LayoutObject* layout_object);
-  AXObject* GetOrCreate(const Node*, AXObject* parent_if_known);
+  AXObject* GetOrCreate(const Node*, AXObject* parent_if_known) override;
   AXObject* GetOrCreate(Node*, AXObject* parent_if_known);
   AXObject* GetOrCreate(Node*);
   AXObject* GetOrCreate(const Node*);
@@ -346,7 +346,7 @@ class MODULES_EXPORT AXObjectCacheImpl
   AXObject* Get(AbstractInlineTextBox*);
 
   // Get an AXObject* backed by the passed-in DOM node.
-  AXObject* Get(const Node*);
+  AXObject* Get(const Node*) override;
   // Get an AXObject* backed by the passed-in LayoutObject, or the
   // LayoutObject's DOM node, if that is available.
   // If |parent_for_repair| is provided, and the object had been detached from