Back out my previous checkin for bug 109081 because it cause bug 128659. R=n/a, SR=n/a, A=n/a
git-svn-id: svn://10.0.0.236/trunk@115718 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -2063,13 +2063,6 @@ GlobalWindowImpl::Focus()
|
||||
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
|
||||
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
|
||||
if (treeOwnerAsWin) {
|
||||
PRBool isEnabled = PR_TRUE;
|
||||
treeOwnerAsWin->GetEnabled(&isEnabled);
|
||||
if (!isEnabled) {
|
||||
NS_WARNING( "Should not try to set the focus on a disabled window" );
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
treeOwnerAsWin->SetVisibility(PR_TRUE);
|
||||
nsCOMPtr<nsIEmbeddingSiteWindow> embeddingWin(do_GetInterface(treeOwnerAsWin));
|
||||
if (embeddingWin)
|
||||
@@ -3420,16 +3413,8 @@ GlobalWindowImpl::Activate()
|
||||
*/
|
||||
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
|
||||
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
|
||||
if (treeOwnerAsWin) {
|
||||
PRBool isEnabled = PR_TRUE;
|
||||
treeOwnerAsWin->GetEnabled(&isEnabled);
|
||||
if (!isEnabled) {
|
||||
NS_WARNING( "Should not try to activate a disabled window" );
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
if (treeOwnerAsWin)
|
||||
treeOwnerAsWin->SetVisibility(PR_TRUE);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
mDocShell->GetPresShell(getter_AddRefs(presShell));
|
||||
|
||||
Reference in New Issue
Block a user