Permalink
Browse files

Merge backout of revision 08e208698ef0, bug 533688 because of Tinderb…

…ox orange.
  • Loading branch information...
2 parents 57f6ed3 + 437c935 commit d829863ff8f171b6317707e158a4314ab1b7cf89 @bsmedberg bsmedberg committed Dec 16, 2009
Showing with 3 additions and 6 deletions.
  1. +1 −1 accessible/src/atk/nsAccessibleWrap.cpp
  2. +2 −5 accessible/src/base/nsRootAccessible.cpp
View
2 accessible/src/atk/nsAccessibleWrap.cpp
@@ -925,10 +925,10 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex)
NS_ASSERTION(childAtkObj, "Fail to get AtkObj");
if (!childAtkObj)
return nsnull;
- g_object_ref(childAtkObj);
//this will addref parent
atk_object_set_parent(childAtkObj, aAtkObj);
+ g_object_ref(childAtkObj);
return childAtkObj;
}
View
7 accessible/src/base/nsRootAccessible.cpp
@@ -947,12 +947,9 @@ nsRootAccessible::Init()
nsRefPtr<nsApplicationAccessibleWrap> root = GetApplicationAccessible();
NS_ENSURE_STATE(root);
- nsresult rv = nsDocAccessibleWrap::Init();
+ root->AddRootAccessible(this);
- if (NS_SUCCEEDED(rv))
- root->AddRootAccessible(this);
-
- return rv;
+ return nsDocAccessibleWrap::Init();
}
nsresult

0 comments on commit d829863

Please sign in to comment.