From 8178a345afc5acf4d6e77da6f54a67b26acb929c Mon Sep 17 00:00:00 2001
From: Lorien Hu <lorien@lorienhu.com>
Date: Mon, 8 Jun 2015 14:12:03 -0400
Subject: [PATCH] Bug 1172577 - Handle proxies in mozAccessible method
 customDescription r=tbsaunde

---
 accessible/mac/mozAccessible.mm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/accessible/mac/mozAccessible.mm b/accessible/mac/mozAccessible.mm
index fdacb6f43911..5bd916e72777 100644
--- a/accessible/mac/mozAccessible.mm
+++ b/accessible/mac/mozAccessible.mm
@@ -600,12 +600,13 @@ struct RoleDescrComparator
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  AccessibleWrap* accWrap = [self getGeckoAccessible];
-  if (accWrap->IsDefunct())
-    return nil;
-
   nsAutoString desc;
-  accWrap->Description(desc);
+  if (AccessibleWrap* accWrap = [self getGeckoAccessible])
+    accWrap->Description(desc);
+  else if (ProxyAccessible* proxy = [self getProxyAccessible])
+    proxy->Description(desc);
+  else
+    return nil;
 
   return nsCocoaUtils::ToNSString(desc);