From 62bf36964a4f2452f5b82a8066fe7e62b8946a21 Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Tue, 29 Feb 2000 06:51:39 +0000 Subject: [PATCH] Bug 28670: Remove unneeded scrollparam to webshell::Init r=travis a=rickg git-svn-id: svn://10.0.0.236/trunk@61847 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/tests/viewer/nsBrowserWindow.cpp | 4 ++-- mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 0796541d9b5..607d778ab4b 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1121,7 +1121,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell, nsCOMPtr webShell(do_QueryInterface(mDocShell)); rv = webShell->Init(mWindow->GetNativeData(NS_NATIVE_WIDGET), r.x, r.y, r.width, r.height, - nsScrollPreference_kAuto, aAllowPlugins, PR_TRUE); + aAllowPlugins, PR_TRUE); webShell->SetContainer((nsIWebShellContainer*) this); nsCOMPtr docShellAsItem(do_QueryInterface(mDocShell)); @@ -1209,7 +1209,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell, nsCOMPtr webShell(do_QueryInterface(mDocShell)); rv = webShell->Init(mWindow->GetNativeData(NS_NATIVE_WIDGET), r.x, r.y, r.width, r.height, - nsScrollPreference_kAuto, aAllowPlugins); + aAllowPlugins); webShell->SetContainer((nsIWebShellContainer*) this); webShell->GetDocumentLoader(*getter_AddRefs(docLoader)); if (docLoader) { diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp index d4759f6f08b..6e1b4b7aaef 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -233,7 +233,6 @@ nsresult nsXPBaseWindow::Init(nsXPBaseWindowType aType, r.x = r.y = 0; rv = mWebShell->Init(mWindow->GetNativeData(NS_NATIVE_WIDGET), r.x, r.y, r.width, r.height, - nsScrollPreference_kNeverScroll, //nsScrollPreference_kAuto, aAllowPlugins, PR_FALSE); mWebShell->SetContainer((nsIWebShellContainer*) this); mWebShell->SetPrefs(aPrefs);