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
This commit is contained in:
@@ -1121,7 +1121,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
|
||||
nsCOMPtr<nsIWebShell> 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<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
|
||||
@@ -1209,7 +1209,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
|
||||
nsCOMPtr<nsIWebShell> 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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user