Bug 758799 - Check accessible expiry properly. r=dbolter

--HG--
extra : rebase_source : 9ed36a1fe38bac02770c57f82eeef15e6ac9cd74

accessible/src/mac/mozAccessible.h

@@ -47,15 +47,7 @@ GetNativeFromGeckoAccessible(nsIAccessible* aAccessible)
    * Weak reference to the parent
    */
   mozAccessible* mParent;
-  
-  /**
-   * We can be marked as 'expired' if Shutdown() is called on our geckoAccessible.
-   * since we might still be retained by some third-party, we need to do cleanup
-   * in |expire|, and prevent any potential harm that could come from someone using us
-   * after this point.
-   */
-  BOOL mIsExpired;
-  
+
   /**
    * The nsIAccessible role of our gecko accessible.
    */

accessible/src/mac/mozAccessible.mm

@@ -73,7 +73,6 @@ GetClosestInterestingAccessible(id anObject)
 
   if ((self = [super init])) {
     mGeckoAccessible = geckoAccessible;
-    mIsExpired = NO;
     mRole = geckoAccessible->Role();
   }
    
@@ -100,7 +99,7 @@ GetClosestInterestingAccessible(id anObject)
 
   // unknown (either unimplemented, or irrelevant) elements are marked as ignored
   // as well as expired elements.
-  return mIsExpired || [[self role] isEqualToString:NSAccessibilityUnknownRole];
+  return !mGeckoAccessible || [[self role] isEqualToString:NSAccessibilityUnknownRole];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NO);
 }
@@ -110,7 +109,7 @@ GetClosestInterestingAccessible(id anObject)
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
   // if we're expired, we don't support any attributes.
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return [NSArray array];
   
   static NSArray *generalAttributes = nil;
@@ -148,7 +147,7 @@ GetClosestInterestingAccessible(id anObject)
 {  
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return nil;
 
 #if DEBUG
@@ -234,7 +233,7 @@ GetClosestInterestingAccessible(id anObject)
 
 - (id)accessibilityHitTest:(NSPoint)point
 {
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return nil;
 
   // Convert from cocoa's coordinate system to gecko's. According to the docs
@@ -276,7 +275,7 @@ GetClosestInterestingAccessible(id anObject)
 
 - (id)accessibilityFocusedUIElement
 {
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return nil;
   
   Accessible* focusedGeckoChild = mGeckoAccessible->FocusedChild();
@@ -408,7 +407,7 @@ GetClosestInterestingAccessible(id anObject)
 
 - (NSString*)role
 {
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return nil;
 
 #ifdef DEBUG
@@ -549,18 +548,21 @@ GetClosestInterestingAccessible(id anObject)
 
 - (BOOL)canBeFocused
 {
-  return mGeckoAccessible->InteractiveState() & states::FOCUSABLE;
+  return mGeckoAccessible && (mGeckoAccessible->InteractiveState() & states::FOCUSABLE);
 }
 
 - (BOOL)focus
 {
+  if (!mGeckoAccessible)
+    return NO;
+  
   nsresult rv = mGeckoAccessible->TakeFocus();
   return NS_SUCCEEDED(rv);
 }
 
 - (BOOL)isEnabled
 {
-  return (mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0;
+  return mGeckoAccessible && ((mGeckoAccessible->InteractiveState() & states::UNAVAILABLE) == 0);
 }
 
 // The root accessible calls this when the focused node was
@@ -625,7 +627,6 @@ GetClosestInterestingAccessible(id anObject)
 
   [self invalidateChildren];
 
-  mIsExpired = YES;
   mGeckoAccessible = nsnull;
   
   NS_OBJC_END_TRY_ABORT_BLOCK;
@@ -633,7 +634,7 @@ GetClosestInterestingAccessible(id anObject)
 
 - (BOOL)isExpired
 {
-  return mIsExpired;
+  return !mGeckoAccessible;
 }
 
 #pragma mark -

accessible/src/mac/mozActionElements.mm

@@ -73,7 +73,7 @@ enum CheckboxValue {
 
 - (BOOL)accessibilityIsIgnored
 {
-  return mIsExpired;
+  return !mGeckoAccessible;
 }
 
 - (NSArray*)accessibilityActionNames

accessible/src/mac/mozDocAccessible.mm

@@ -31,7 +31,7 @@ getNativeViewFromRootAccessible(Accessible* aAccessible)
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
   
   // if we're expired, we don't support any attributes.
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return [NSArray array];
   
   // standard attributes that are shared and supported by root accessible (AXMain) elements.

accessible/src/mac/mozHTMLAccessible.mm

@@ -33,7 +33,7 @@
 - (NSArray*)accessibilityAttributeNames
 {
   // if we're expired, we don't support any attributes.
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return [NSArray array];
   
   static NSMutableArray* attributes = nil;
@@ -57,7 +57,7 @@
 - (NSArray*)accessibilityActionNames 
 {
     // if we're expired, we don't support any attributes.
-  if (mIsExpired)
+  if (!mGeckoAccessible)
     return [NSArray array];
 
   static NSArray* actionNames = nil;

accessible/src/mac/mozTextAccessible.mm

@@ -67,7 +67,7 @@ ToNSString(id aValue)
 
 - (BOOL)accessibilityIsIgnored
 {
-  return mIsExpired;
+  return !mGeckoAccessible;
 }
 
 - (NSArray*)accessibilityAttributeNames