Skip to content
This repository has been archived by the owner on Oct 3, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge backout of revision 08e208698ef0, bug 533688 because of Tinderb…
…ox orange.
  • Loading branch information
bsmedberg committed Dec 16, 2009
2 parents 57f6ed3 + 437c935 commit d829863
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion accessible/src/atk/nsAccessibleWrap.cpp
Expand Up @@ -925,10 +925,10 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex)
NS_ASSERTION(childAtkObj, "Fail to get AtkObj"); NS_ASSERTION(childAtkObj, "Fail to get AtkObj");
if (!childAtkObj) if (!childAtkObj)
return nsnull; return nsnull;
g_object_ref(childAtkObj);


//this will addref parent //this will addref parent
atk_object_set_parent(childAtkObj, aAtkObj); atk_object_set_parent(childAtkObj, aAtkObj);
g_object_ref(childAtkObj);
return childAtkObj; return childAtkObj;
} }


Expand Down
7 changes: 2 additions & 5 deletions accessible/src/base/nsRootAccessible.cpp
Expand Up @@ -947,12 +947,9 @@ nsRootAccessible::Init()
nsRefPtr<nsApplicationAccessibleWrap> root = GetApplicationAccessible(); nsRefPtr<nsApplicationAccessibleWrap> root = GetApplicationAccessible();
NS_ENSURE_STATE(root); NS_ENSURE_STATE(root);


nsresult rv = nsDocAccessibleWrap::Init(); root->AddRootAccessible(this);


if (NS_SUCCEEDED(rv)) return nsDocAccessibleWrap::Init();
root->AddRootAccessible(this);

return rv;
} }


nsresult nsresult
Expand Down

0 comments on commit d829863

Please sign in to comment.