corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out bug 448830

Browse Source
This commit is contained in:
Robert O'Callahan
2008-09-28 23:13:58 +13:00
parent 7ecc18bb14
commit 247c01e3bb
133 changed files with 930 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@@ -5495,7 +5495,7 @@ nsDocShell::CaptureState()
if (rootView) {
nsIWidget *widget = rootView->GetWidget();
if (widget) {
nsIntRect bounds(0, 0, 0, 0);
nsRect bounds(0, 0, 0, 0);
widget->GetBounds(bounds);
rv = mOSHE->SetViewerBounds(bounds);
}
@@ -5820,7 +5820,7 @@ nsDocShell::RestoreFromHistory()
// bounds of the root view's widget.
nsIView *rootViewSibling = nsnull, *rootViewParent = nsnull;
nsIntRect newBounds(0, 0, 0, 0);
nsRect newBounds(0, 0, 0, 0);
nsCOMPtr<nsIPresShell> oldPresShell;
nsDocShell::GetPresShell(getter_AddRefs(oldPresShell));
@@ -5876,7 +5876,7 @@ nsDocShell::RestoreFromHistory()
}
// get the previous content viewer size
nsIntRect oldBounds(0, 0, 0, 0);
nsRect oldBounds(0, 0, 0, 0);
mLSHE->GetViewerBounds(oldBounds);
// Restore the refresh URI list. The refresh timers will be restarted
@@ -6450,7 +6450,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
nsCOMPtr<nsIWidget> widget;
NS_ENSURE_SUCCESS(GetMainWidget(getter_AddRefs(widget)), NS_ERROR_FAILURE);
nsIntRect bounds(x, y, cx, cy);
nsRect bounds(x, y, cx, cy);
if (NS_FAILED(mContentViewer->Init(widget, bounds))) {
mContentViewer = nsnull;