RWHI should implement BrowserAccessibilityDelegate

content/browser/accessibility/browser_accessibility_cocoa.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 <execinfo.h>
 
 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
 
 #include <map>
 
@@ skipping 289 matching lines @@
   const size_t numAttributes = sizeof(attributeToMethodNameContainer) /
                                sizeof(attributeToMethodNameContainer[0]);
   for (size_t i = 0; i < numAttributes; ++i) {
     [dict setObject:attributeToMethodNameContainer[i].methodName
              forKey:attributeToMethodNameContainer[i].attribute];
   }
   attributeToMethodNameMap = dict;
   dict = nil;
 }
 
-- (id)initWithObject:(BrowserAccessibility*)accessibility
-            delegate:(id<BrowserAccessibilityDelegateCocoa>)delegate {
-  if ((self = [super init])) {
+- (id)initWithObject:(BrowserAccessibility*)accessibility {
+  if ((self = [super init]))
     browserAccessibility_ = accessibility;
-    delegate_ = delegate;
-  }
   return self;
 }
 
 - (void)detach {
   if (browserAccessibility_) {
     NSAccessibilityUnregisterUniqueIdForUIElement(self);
     browserAccessibility_ = NULL;
   }
 }
 
@@ skipping 333 matching lines @@
     BrowserAccessibilityManagerMac* manager =
         static_cast<BrowserAccessibilityManagerMac*>(
             browserAccessibility_->manager());
     return manager->parent_view();
   }
 }
 
 - (NSValue*)position {
   NSPoint origin = [self origin];
   NSSize size = [[self size] sizeValue];
-  NSPoint pointInScreen =
-      [delegate_ accessibilityPointInScreen:origin size:size];
+  NSPoint pointInScreen = [self pointInScreen:origin size:size];
   return [NSValue valueWithPoint:pointInScreen];
 }
 
 - (NSNumber*)required {
   return [NSNumber numberWithBool:
       GetState(browserAccessibility_, ui::AX_STATE_REQUIRED)];
 }
 
 // Returns an enum indicating the role from browserAccessibility_.
 - (ui::AXRole)internalRole {
   return static_cast<ui::AXRole>(browserAccessibility_->GetRole());
 }
 
+- (content::BrowserAccessibilityDelegate*)delegate {
+  return browserAccessibility_->manager() ?
+      browserAccessibility_->manager()->delegate() :
+      nil;
+}
+
+- (NSPoint)pointInScreen:(NSPoint)origin
+                    size:(NSSize)size {
+  if (!browserAccessibility_)
+    return NSZeroPoint;
+
+  gfx::Rect bounds(origin.x, origin.y, size.width, size.height);
+  gfx::Point point = [self delegate]->AccessibilityOriginInScreen(bounds);
+  return NSMakePoint(point.x(), point.y());
+}
+
 // Returns a string indicating the NSAccessibility role of this object.
 - (NSString*)role {
   ui::AXRole role = [self internalRole];
   if (role == ui::AX_ROLE_CANVAS &&
       browserAccessibility_->GetBoolAttribute(
           ui::AX_ATTR_CANVAS_HAS_FALLBACK)) {
     return NSAccessibilityGroupRole;
   }
   if (role == ui::AX_ROLE_BUTTON || role == ui::AX_ROLE_TOGGLE_BUTTON) {
     bool isAriaPressedDefined;
@@ skipping 304 matching lines @@
 - (NSArray*)visibleRows {
   return [self rows];
 }
 
 - (NSNumber*)visited {
   return [NSNumber numberWithBool:
       GetState(browserAccessibility_, ui::AX_STATE_VISITED)];
 }
 
 - (id)window {
-  return [delegate_ window];
+  if (!browserAccessibility_)
+    return nil;
+
+  BrowserAccessibilityManagerMac* manager =
+      static_cast<BrowserAccessibilityManagerMac*>(
+          browserAccessibility_->manager());
+  return [manager->parent_view() window];
 }
 
 - (NSString*)methodNameForAttribute:(NSString*)attribute {
   return [attributeToMethodNameMap objectForKey:attribute];
 }
 
 // Returns the accessibility value for the given attribute.  If the value isn't
 // supported this will return nil.
 - (id)accessibilityAttributeValue:(NSString*)attribute {
   if (!browserAccessibility_)
@@ skipping 135 matching lines @@
 
   if ([attribute isEqualToString:
       NSAccessibilityBoundsForRangeParameterizedAttribute]) {
     if ([self internalRole] != ui::AX_ROLE_STATIC_TEXT)
       return nil;
     NSRange range = [(NSValue*)parameter rangeValue];
     gfx::Rect rect = browserAccessibility_->GetGlobalBoundsForRange(
         range.location, range.length);
     NSPoint origin = NSMakePoint(rect.x(), rect.y());
     NSSize size = NSMakeSize(rect.width(), rect.height());
-    NSPoint pointInScreen =
-        [delegate_ accessibilityPointInScreen:origin size:size];
+    NSPoint pointInScreen = [self pointInScreen:origin size:size];
     NSRect nsrect = NSMakeRect(
         pointInScreen.x, pointInScreen.y, rect.width(), rect.height());
     return [NSValue valueWithRect:nsrect];
   }
 
   // TODO(dtseng): support the following attributes.
   if ([attribute isEqualTo:
           NSAccessibilityRangeForPositionParameterizedAttribute] ||
       [attribute isEqualTo:
           NSAccessibilityRangeForIndexParameterizedAttribute] ||
@@ skipping 283 matching lines @@
 
   return [self isIgnored];
 }
 
 // Performs the given accessibilty action on the webkit accessibility object
 // that backs this object.
 - (void)accessibilityPerformAction:(NSString*)action {
   if (!browserAccessibility_)
     return;
 
-  // TODO(feldstein): Support more actions.
-  if ([action isEqualToString:NSAccessibilityPressAction])
-    [delegate_ doDefaultAction:browserAccessibility_->GetId()];
-  else if ([action isEqualToString:NSAccessibilityShowMenuAction])
-    [delegate_ performShowMenuAction:self];
+  // TODO(dmazzoni): Support more actions.
+  if ([action isEqualToString:NSAccessibilityPressAction]) {
+    [self delegate]->AccessibilityDoDefaultAction(
+        browserAccessibility_->GetId());
+  } else if ([action isEqualToString:NSAccessibilityShowMenuAction]) {
+    [self delegate]->AccessibilityShowMenu(browserAccessibility_->GetId());
+  }
 }
 
 // Returns the description of the given action.
 - (NSString*)accessibilityActionDescription:(NSString*)action {
   if (!browserAccessibility_)
     return nil;
 
   return NSAccessibilityActionDescription(action);
 }
 
 // Sets an override value for a specific accessibility attribute.
 // This class does not support this.
 - (BOOL)accessibilitySetOverrideValue:(id)value
                          forAttribute:(NSString*)attribute {
   return NO;
 }
 
 // Sets the value for an accessibility attribute via the accessibility API.
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   if (!browserAccessibility_)
     return;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute]) {
     NSNumber* focusedNumber = value;
     BOOL focused = [focusedNumber intValue];
-    [delegate_ setAccessibilityFocus:focused
-                     accessibilityId:browserAccessibility_->GetId()];
+    if (focused)
+      [self delegate]->AccessibilitySetFocus(browserAccessibility_->GetId());
   }
   if ([attribute isEqualToString:NSAccessibilitySelectedTextRangeAttribute]) {
     NSRange range = [(NSValue*)value rangeValue];
-    [delegate_
-        accessibilitySetTextSelection:browserAccessibility_->GetId()
-        startOffset:range.location
-        endOffset:range.location + range.length];
+    [self delegate]->AccessibilitySetTextSelection(
+        browserAccessibility_->GetId(),
+        range.location, range.location + range.length);
   }
 }
 
 // Returns the deepest accessibility child that should not be ignored.
 // It is assumed that the hit test has been narrowed down to this object
 // or one of its children, so this will never return nil unless this
 // object is invalid.
 - (id)accessibilityHitTest:(NSPoint)point {
   if (!browserAccessibility_)
     return nil;
@@ skipping 31 matching lines @@
     return [super hash];
   return browserAccessibility_->GetId();
 }
 
 - (BOOL)accessibilityShouldUseUniqueId {
   return YES;
 }
 
 @end