From 0dcd4e35086a90f643bb721fad1ef786f5fff8ba Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Wed, 29 Oct 2014 11:13:52 +0100
Subject: [PATCH] <chromium> Fix building with MacOSX10.10.sdk.
The compiler shipping with newer SDKs is more restrictive
with regards to type conversion. It is not accepted
anymore to pass nil (nullptr) for NSUInteger or BOOL.
Change-Id: I15fbfe480aab42e505cec0c6fa47feed718f31c1
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
.../browser/accessibility/browser_accessibility_cocoa.mm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/chromium/content/browser/accessibility/browser_accessibility_cocoa.mm b/chromium/content/browser/accessibility/browser_accessibility_cocoa.mm
index 232e4827750..970a7e3c49f 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/chromium/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -1283,7 +1283,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];
@@ -1439,7 +1439,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]) {
@@ -1454,7 +1454,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_,
--
GitLab