Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out 233441.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@156464 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2004-05-17 16:29:13 +00:00
parent b74d33a9ee
commit 92e59ef827
35 changed files with 450 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -1603,7 +1603,11 @@ nsDocShell::SetZoom(float zoom)
if (scrollableView)
scrollableView->ComputeScrollOffsets();
vm->UpdateView(vm->RootView(), 0);
// get the root view
nsIView *rootView = nsnull; // views are not ref counted
vm->GetRootView(rootView);
if (rootView)
vm->UpdateView(rootView, 0);
return NS_OK;
}
@@ -3280,8 +3284,13 @@ nsDocShell::GetVisibility(PRBool * aVisibility)
nsIViewManager* vm = presShell->GetViewManager();
NS_ENSURE_TRUE(vm, NS_ERROR_FAILURE);
// get the root view
nsIView *view = nsnull; // views are not ref counted
NS_ENSURE_SUCCESS(vm->GetRootView(view), NS_ERROR_FAILURE);
NS_ENSURE_TRUE(view, NS_ERROR_FAILURE);
// if our root view is hidden, we are not visible
if (vm->RootView()->GetVisibility() == nsViewVisibility_kHide) {
if (view->GetVisibility() == nsViewVisibility_kHide) {
*aVisibility = PR_FALSE;
return NS_OK;
}