MacViews a11y: Sync VoiceOver cursor with keyboard focus.

ui/views/cocoa/bridged_content_view.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_mac.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/compositor/canvas_painter.h"
 #import "ui/events/cocoa/cocoa_event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/gfx/canvas_paint_mac.h"
 #include "ui/gfx/geometry/rect.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/path.h"
 #import "ui/gfx/path_mac.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
+#import "ui/accessibility/platform/ax_platform_node_mac.h"

[tapted, 2016/09/26 05:19:18]

nit: was this needed in the end?

[Patti Lor, 2016/09/28 00:29:14]

Nope, have deleted it now - thanks.

+#include "ui/views/accessibility/native_view_accessibility.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 #import "ui/views/cocoa/drag_drop_client_mac.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/widget.h"
 
 using views::MenuController;
 
@@ skipping 1318 matching lines @@
     return @[ hostedView_->GetNativeViewAccessible() ];
   }
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
+- (id)accessibilityFocusedUIElement {
+  NSWindow* keyWindow = [NSApp keyWindow];
+  // There won't be a keyWindow if there are no windows/views receiving keyboard
+  // events, which means nothing from this NSApp has focus.
+  if (!keyWindow)
+    return nil;
+
+  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(keyWindow);
+  if (!widget)
+    return nil;

[tapted, 2016/09/26 05:19:17]

accessibilityFocusedUIElement says the receiver can assume that it's already
focused. widget->GetRootView() should be equivalent to |hostedView_| in that
case. But a11y requests can come in at odd times. I think this method can do

  if (!hostedView_)
    return nil;
  return hostedView_->GetNativeViewAccessibility()->GetFocus()

This ensures that we don't accidentally return a node in another window.

[Patti Lor, 2016/09/28 00:29:14]

Done.

+  return widget->GetRootView()->GetNativeViewAccessibility()->GetFocus();
+}
+
 @end