Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / accessibility / browser_accessibility_cocoa.mm

diff --git a/src/content/browser/accessibility/browser_accessibility_cocoa.mm b/src/content/browser/accessibility/browser_accessibility_cocoa.mm
index 5086982..a4b31fc 100644 (file)
--- a/src/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/src/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -1152,7 +1152,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 // Returns the count of the specified accessibility array attribute.
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute {
   if (!browserAccessibility_)
-    return nil;
+    return 0;
 
   NSArray* fullArray = [self accessibilityAttributeValue:attribute];
   return [fullArray count];
@@ -1314,7 +1314,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 // Returns the index of the child in this objects array of children.
 - (NSUInteger)accessibilityGetIndexOf:(id)child {
   if (!browserAccessibility_)
-    return nil;
+    return 0;
 
   NSUInteger index = 0;
   for (BrowserAccessibilityCocoa* childToCheck in [self children]) {
@@ -1329,7 +1329,7 @@ NSDictionary* attributeToMethodNameMap = nil;
 // accessibility API via |accessibilitySetValue:forAttribute:|.
 - (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute {
   if (!browserAccessibility_)
-    return nil;
+    return NO;
 
   if ([attribute isEqualToString:NSAccessibilityFocusedAttribute])
     return GetState(browserAccessibility_,