Virtual Views now firing native events

NVDA now reads table in HungRendererDialogView. AxVirtualView needed to
implement GetTargetForNativeAccessibilityEvent. As of now, this works
for the repro steps in http://crbug.com/998237.

Bug: 998237
Change-Id: Idadf5be2345e56dc6aa14107710adc7685d07584
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1773569Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Adina Shanholtz <adinas@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#694307}

ui/views/accessibility/ax_virtual_view.cc

@@ -12,6 +12,7 @@
 
 #include "base/callback.h"
 #include "base/no_destructor.h"
+#include "build/build_config.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
@@ -20,6 +21,10 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+#if OS_WIN
+#include "ui/views/win/hwnd_util.h"
+#endif
+
 namespace views {
 
 // Tracks all virtual ax views.
@@ -311,6 +316,16 @@ const ui::AXUniqueId& AXVirtualView::GetUniqueId() const {
   return unique_id_;
 }
 
+// Virtual views need to implement this function in order for A11Y events
+// to be routed correctly.
+gfx::AcceleratedWidget AXVirtualView::GetTargetForNativeAccessibilityEvent() {
+#if defined(OS_WIN)
+  if (GetOwnerView())
+    return HWNDForView(GetOwnerView());
+#endif
+  return gfx::kNullAcceleratedWidget;
+}
+
 bool AXVirtualView::HandleAccessibleAction(
     const ui::AXActionData& action_data) {
   return false;

ui/views/accessibility/ax_virtual_view.h

@@ -139,6 +139,7 @@ class VIEWS_EXPORT AXVirtualView : public ui::AXPlatformNodeDelegateBase {
   bool ShouldIgnoreHoveredStateForTesting() override;
   bool IsOffscreen() const override;
   const ui::AXUniqueId& GetUniqueId() const override;
+  gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
 
   // Gets the real View that owns our shallowest virtual ancestor,, if any.
   View* GetOwnerView() const;

ui/views/accessibility/ax_virtual_view_unittest.cc

@@ -5,6 +5,7 @@
 #include "ui/views/accessibility/ax_virtual_view.h"
 
 #include "base/memory/ptr_util.h"
+#include "build/build_config.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/geometry/rect.h"
@@ -15,6 +16,10 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include "ui/views/win/hwnd_util.h"
+#endif
+
 namespace views {
 namespace test {
 
@@ -385,5 +390,15 @@ TEST_F(AXVirtualViewTest, Navigation) {
   EXPECT_EQ(0, virtual_child_4->GetIndexInParent());
 }
 
+// Test for GetTargetForNativeAccessibilityEvent().
+#if defined(OS_WIN)
+TEST_F(AXVirtualViewTest, GetTargetForEvents) {
+  EXPECT_EQ(button_, virtual_label_->GetOwnerView());
+  EXPECT_NE(nullptr, HWNDForView(virtual_label_->GetOwnerView()));
+  EXPECT_EQ(HWNDForView(button_),
+            virtual_label_->GetTargetForNativeAccessibilityEvent());
+}
+#endif
+
 }  // namespace test
 }  // namespace views