Bug 174317, [gtk2] should use nsCOMPtr type for mTopLevelAccessible in nsWindow. This is NOT for default build.

widget/src/gtk2/nsWindow.cpp

@@ -64,10 +64,6 @@
 #include "nsXPIDLString.h"
 #include "nsIFile.h"
 
-#ifdef ACCESSIBILITY
-#include "nsAccessibilityInterface.h"
-#endif
-
 /* utility functions */
 static PRBool     check_for_rollup(GdkWindow *aWindow,
                                    gdouble aMouseX, gdouble aMouseY,
@@ -432,8 +428,10 @@ nsWindow::Destroy(void)
     OnDestroy();
 
 #ifdef ACCESSIBILITY
-    if (mTopLevelAccessible)
+    if (mTopLevelAccessible) {
         nsAccessibilityInterface::RemoveTopLevel(mTopLevelAccessible);
+        mTopLevelAccessible = nsnull;
+    }
 #endif
 
     return NS_OK;

widget/src/gtk2/nsWindow.h

@@ -52,6 +52,10 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtkwindow.h>
 
+#ifdef ACCESSIBILITY
+#include "nsAccessibilityInterface.h"
+#endif
+
 #ifdef USE_XIM
 #include <gtk/gtkimmulticontext.h>
 #include "pldhash.h"
@@ -270,7 +274,7 @@ private:
     PRInt32             mSizeState;
 
 #ifdef ACCESSIBILITY
-    nsIAccessible      *mTopLevelAccessible;
+    nsCOMPtr<nsIAccessible> mTopLevelAccessible;
     void                CreateTopLevelAccessible();
     NS_IMETHOD_(PRBool) DispatchAccessibleEvent(nsIAccessible** aAccessible);
 #endif