MacViews a11y: Sync VoiceOver cursor with keyboard focus.

ui/accessibility/platform/ax_platform_node_mac.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/accessibility/platform/ax_platform_node_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
+#import "base/mac/sdk_forward_declarations.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 
+#import "tmp-traceclass.h"
+
 namespace {
 
 struct RoleMapEntry {
   ui::AXRole value;
   NSString* nativeValue;
 };
 
 struct EventMapEntry {
   ui::AXEvent value;
   NSString* nativeValue;
@@ skipping 163 matching lines @@
   };
 
   RoleMap subrole_map;
   for (size_t i = 0; i < arraysize(subroles); ++i)
     subrole_map[subroles[i].value] = subroles[i].nativeValue;
   return subrole_map;
 }
 
 EventMap BuildEventMap() {
   const EventMapEntry events[] = {
+      {ui::AX_EVENT_FOCUS, NSAccessibilityFocusedUIElementChangedNotification},
       {ui::AX_EVENT_TEXT_CHANGED, NSAccessibilityTitleChangedNotification},
       {ui::AX_EVENT_VALUE_CHANGED, NSAccessibilityValueChangedNotification},
       {ui::AX_EVENT_TEXT_SELECTION_CHANGED,
        NSAccessibilitySelectedTextChangedNotification},
       // TODO(patricialor): Add more events.
   };
 
   EventMap event_map;
   for (size_t i = 0; i < arraysize(events); ++i)
     event_map[events[i].value] = events[i].nativeValue;
   return event_map;
 }
 
-void NotifyMacEvent(NSView* target, ui::AXEvent event_type) {
+void NotifyMacEvent(id target, ui::AXEvent event_type) {
   NSAccessibilityPostNotification(
       target, [AXPlatformNodeCocoa nativeNotificationFromAXEvent:event_type]);
 }
 
 }  // namespace
 
 @interface AXPlatformNodeCocoa ()
 // Helper function for string attributes that don't require extra processing.
 - (NSString*)getStringAttribute:(ui::AXStringAttribute)attribute;
 @end
@@ skipping 21 matching lines @@
   return it != event_map.end() ? it->second : nil;
 }
 
 - (instancetype)initWithNode:(ui::AXPlatformNodeBase*)node {
   if ((self = [super init])) {
     node_ = node;
   }
   return self;
 }
 
+- (BOOL)isEqual:(id)object {
+  if (![object isKindOfClass:[AXPlatformNodeCocoa class]])
+    return NO;
+  return ([self hash] == [object hash]);
+}
+
+- (NSUInteger)hash {
+  // Potentially called during dealloc.
+  if (!node_)
+    return [super hash];
+  return node_->GetData().id;
+}
+
 - (void)detach {
+  if (!node_)
+    return;
+  NSAccessibilityPostNotification(
+      self, NSAccessibilityUIElementDestroyedNotification);
+  NSAccessibilityUnregisterUniqueIdForUIElement(self);
   node_ = nil;
 }
 
 - (NSRect)boundsInScreen {
   if (!node_)
     return NSZeroRect;
   return gfx::ScreenRectToNSRect(node_->GetBoundsInScreen());
 }
 
 - (NSString*)getStringAttribute:(ui::AXStringAttribute)attribute {
@@ skipping 10 matching lines @@
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   for (AXPlatformNodeCocoa* child in [self AXChildren]) {
     if (NSPointInRect(point, child.boundsInScreen))
       return [child accessibilityHitTest:point];
   }
   return NSAccessibilityUnignoredAncestor(self);
 }
 
+- (BOOL)accessibilityNotifiesWhenDestroyed {
+  return YES;
+}
+
+- (BOOL)accessibilityShouldUseUniqueId {
+  return YES;
+}
+
 - (NSArray*)accessibilityActionNames {
   return nil;
 }
 
 - (NSArray*)accessibilityAttributeNames {
   // These attributes are required on all accessibility objects.
   NSArray* const kAllRoleAttributes = @[
     NSAccessibilityChildrenAttribute,
     NSAccessibilityParentAttribute,
     NSAccessibilityPositionAttribute,
@@ skipping 212 matching lines @@
   AXPlatformNodeBase::Destroy();
 }
 
 gfx::NativeViewAccessible AXPlatformNodeMac::GetNativeViewAccessible() {
   if (!native_node_)
     native_node_.reset([[AXPlatformNodeCocoa alloc] initWithNode:this]);
   return native_node_.get();
 }
 
 void AXPlatformNodeMac::NotifyAccessibilityEvent(ui::AXEvent event_type) {
-  NSView* target = GetDelegate()->GetTargetForNativeAccessibilityEvent();
-
+  if (!native_node_)
+    GetNativeViewAccessible();
   // Add mappings between ui::AXEvent and NSAccessibility notifications using
   // the EventMap above. This switch contains exceptions to those mappings.
   switch (event_type) {
+    case ui::AX_EVENT_FOCUS:
+      [Tracer startTracePlatformNode];
+      NSAccessibilityPostNotification(
+          native_node_, NSAccessibilityFocusedUIElementChangedNotification);
+      [Tracer platformNodeEndTrace];
+      return;

[Patti Lor, 2016/08/04 02:06:26]

With tracing removed, this whole hunk shouldn't be here.

     case ui::AX_EVENT_TEXT_CHANGED:
       // If the view is a user-editable textfield, this should change the value.
       if (GetData().role == ui::AX_ROLE_TEXT_FIELD) {
-        NotifyMacEvent(target, ui::AX_EVENT_VALUE_CHANGED);
+        NotifyMacEvent(native_node_, ui::AX_EVENT_VALUE_CHANGED);
         return;
       }
       break;
     default:
       break;
   }
-  NotifyMacEvent(target, event_type);
+  NotifyMacEvent(native_node_, event_type);
 }
 
 int AXPlatformNodeMac::GetIndexInParent() {
   // TODO(dmazzoni): implement this.  http://crbug.com/396137
   return -1;
 }
 
 }  // namespace ui