bug #15341 and bug #15344. Use the documentloader observer instead of a stream observer.

git-svn-id: svn://10.0.0.236/trunk@49795 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1999-10-05 04:04:16 +00:00
parent ff7384e823
commit fa598b6cae
20 changed files with 427 additions and 827 deletions

View File

@@ -332,7 +332,6 @@ nsresult nsWebShellWindow::Initialize(nsIWebShellWindow* aParent,
nsIAppShell* aShell, nsIURI* aUrl,
PRBool aCreatedVisible,
PRBool aLoadDefaultPage,
nsIStreamObserver* anObserver,
nsIXULWindowCallbacks *aCallbacks,
PRInt32 aInitialWidth, PRInt32 aInitialHeight,
nsWidgetInitData& widgetInitData)
@@ -396,7 +395,6 @@ nsresult nsWebShellWindow::Initialize(nsIWebShellWindow* aParent,
PR_TRUE, // Allow Plugins
PR_TRUE);
mWebShell->SetContainer(this);
mWebShell->SetObserver((nsIStreamObserver*)anObserver);
mWebShell->SetDocLoaderObserver(this);
// The outermost web shell is always considered to be chrome.
@@ -2619,7 +2617,7 @@ NS_IMETHODIMP nsWebShellWindow::Init(nsIAppShell* aAppShell,
widgetInitData.mBorderStyle = eBorderStyle_default;
rv = Initialize(nsnull, aAppShell, urlObj, PR_TRUE, PR_TRUE,
nsnull, nsnull, aBounds.width, aBounds.height, widgetInitData);
nsnull, aBounds.width, aBounds.height, widgetInitData);
mChromeMask = aChromeMask;
if (NS_SUCCEEDED(rv))
MoveTo(aBounds.x, aBounds.y);