Added the selected text marker range to the dictionary for the selection change notification

content/browser/accessibility/browser_accessibility_manager_mac.mm

 // Copyright (c) 2012 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.
 
 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
 
 #include <stddef.h>
 
 #import "base/mac/mac_util.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 40 matching lines @@
 NSString* const NSAccessibilityLayoutCompleteNotification =
     @"AXLayoutComplete";
 NSString* const NSAccessibilityLoadCompleteNotification =
     @"AXLoadComplete";
 NSString* const NSAccessibilityInvalidStatusChangedNotification =
     @"AXInvalidStatusChanged";
 NSString* const NSAccessibilityLiveRegionChangedNotification =
     @"AXLiveRegionChanged";
 NSString* const NSAccessibilityMenuItemSelectedNotification =
     @"AXMenuItemSelected";
+
+// Attributes used for NSAccessibilitySelectedTextChangedNotification.
 NSString* const NSAccessibilityTextStateChangeTypeKey =
     @"AXTextStateChangeType";
 NSString* const NSAccessibilityTextStateSyncKey = @"AXTextStateSync";
 NSString* const NSAccessibilityTextSelectionDirection =
     @"AXTextSelectionDirection";
 NSString* const NSAccessibilityTextSelectionGranularity =
     @"AXTextSelectionGranularity";
 NSString* const NSAccessibilityTextSelectionChangedFocus =
     @"AXTextSelectionChangedFocus";
-NSString* const NSAccessibilityTextChangeElement =
-    @"AXAccessibilityTextChangeElement";
+NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
+    @"AXSelectedTextMarkerRange";
+NSString* const NSAccessibilityTextChangeElement = @"AXTextChangeElement";
 
 }  // namespace
 
 namespace content {
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
     const ui::AXTreeUpdate& initial_tree,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory) {
@@ skipping 98 matching lines @@
         mac_notification = NSAccessibilitySelectedChildrenChangedNotification;
       }
       break;
     case ui::AX_EVENT_DOCUMENT_SELECTION_CHANGED: {
       mac_notification = NSAccessibilitySelectedTextChangedNotification;
       if (base::mac::IsOSElCapitanOrLater()) {
         // |NSAccessibilityPostNotificationWithUserInfo| should be used on OS X
         // 10.11 or later to notify Voiceover about text selection changes. This
         // API has been present on versions of OS X since 10.7 but doesn't
         // appear to be needed by Voiceover before version 10.11.
+        // WebKit fires a notification both on the focused object and the root.
         NSDictionary* user_info =
             GetUserInfoForSelectedTextChangedNotification();
+
+        BrowserAccessibility* focus = GetFocus();
+        if (!focus)
+          return;
         NSAccessibilityPostNotificationWithUserInfo(
-            native_node, mac_notification, user_info);
+            focus->ToBrowserAccessibilityCocoa(), mac_notification, user_info);
+
+        BrowserAccessibility* root = GetRoot();
+        if (!root)
+          return;
+        NSAccessibilityPostNotificationWithUserInfo(
+            root->ToBrowserAccessibilityCocoa(), mac_notification, user_info);
         return;
       }
       break;
     }
     case ui::AX_EVENT_CHECKED_STATE_CHANGED:
     case ui::AX_EVENT_VALUE_CHANGED:
       mac_notification = NSAccessibilityValueChangedNotification;
       break;
     // TODO(nektar): Need to add an event for live region created.
     case ui::AX_EVENT_LIVE_REGION_CHANGED:
@@ skipping 71 matching lines @@
   // internal state and find newly-added live regions this time.
   BrowserAccessibilityMac* root =
       static_cast<BrowserAccessibilityMac*>(GetRoot());
   if (root) {
     root->RecreateNativeObject();
     NotifyAccessibilityEvent(ui::AX_EVENT_CHILDREN_CHANGED, root);
   }
 }
 
 // Returns an autoreleased object.
-NSDictionary* BrowserAccessibilityManagerMac::
-    GetUserInfoForSelectedTextChangedNotification() {
+NSDictionary*
+BrowserAccessibilityManagerMac::GetUserInfoForSelectedTextChangedNotification() {
   NSMutableDictionary* user_info = [[[NSMutableDictionary alloc] init]
       autorelease];
   [user_info setObject:[NSNumber numberWithBool:YES]
                 forKey:NSAccessibilityTextStateSyncKey];
   [user_info setObject:[NSNumber numberWithInt:AXTextStateChangeTypeUnknown]
                 forKey:NSAccessibilityTextStateChangeTypeKey];
   [user_info
       setObject:[NSNumber numberWithInt:AXTextSelectionDirectionUnknown]
          forKey:NSAccessibilityTextSelectionDirection];
   [user_info
       setObject:[NSNumber numberWithInt:AXTextSelectionGranularityUnknown]
          forKey:NSAccessibilityTextSelectionGranularity];
   [user_info setObject:[NSNumber numberWithBool:YES]
                 forKey:NSAccessibilityTextSelectionChangedFocus];
-  // TODO(nektar): Set selected text marker range.
 
   int32_t focus_id = GetTreeData().sel_focus_object_id;
   BrowserAccessibility* focus_object = GetFromID(focus_id);
   if (focus_object) {
     focus_object = focus_object->GetClosestPlatformObject();
     auto native_focus_object = focus_object->ToBrowserAccessibilityCocoa();
-    if (native_focus_object)
+    if (native_focus_object) {
+      LOG(ERROR) << "Marker range " << ([native_focus_object selectedTextMarkerRange] == nil) << "  " << [[native_focus_object role] UTF8String];

[Mark Mentovai, 2016/02/19 00:33:29]

Remove this LOG.

+      [user_info setObject:[native_focus_object selectedTextMarkerRange]
+                    forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
       [user_info setObject:native_focus_object
                     forKey:NSAccessibilityTextChangeElement];
+    }
   }
 
   return user_info;
 }
 
 }  // namespace content