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

Support aggregation (sort of)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-07-21 16:44:45 +00:00
parent c37a73c664
commit bc6df48804
3 changed files with 142 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -155,6 +155,7 @@ protected:
nsIContentViewer* mContentViewer;
nsIDeviceContext* mDeviceContext;
nsIWidget* mWindow;
nsISupports* mInnerWindow;
nsIDocumentLoader* mDocLoader;
nsIWebShell* mParent;
@@ -206,6 +207,8 @@ nsWebShell::nsWebShell()
nsWebShell::~nsWebShell()
{
NS_IF_RELEASE(mInnerWindow);
NS_IF_RELEASE(mContentViewer);
NS_IF_RELEASE(mContainer);
@@ -262,6 +265,9 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr)
AddRef();
return NS_OK;
}
if (nsnull != mInnerWindow) {
return mInnerWindow->QueryInterface(aIID, aInstancePtr);
}
return NS_NOINTERFACE;
}
@@ -324,7 +330,8 @@ nsWebShell::Init(nsNativeWidget aNativeParent,
WEB_TRACE(WEB_TRACE_CALLS,
("nsWebShell::Init: this=%p", this));
nsresult rv = NSRepository::CreateInstance(kDocumentLoaderCID, nsnull,
nsresult rv = NSRepository::CreateInstance(kDocumentLoaderCID,
nsnull,
kIDocumentLoaderIID,
(void**)&mDocLoader);
@@ -347,13 +354,23 @@ nsWebShell::Init(nsNativeWidget aNativeParent,
mDeviceContext->SetGamma(1.7f);
// Create a Native window for the shell container...
rv = NSRepository::CreateInstance(kChildCID, nsnull, kIWidgetIID,
(void**)&mWindow);
rv = NSRepository::CreateInstance(kChildCID,
(nsISupports*)((nsIWebShell*)this),
kISupportsIID,
(void**)&mInnerWindow);
if (NS_OK != rv) {
goto done;
}
mWindow->Create(aNativeParent, aBounds, nsWebShell::HandleEvent,
mDeviceContext, nsnull);
mInnerWindow->QueryInterface(kIWidgetIID, (void**) &mWindow);
if (NS_OK != rv) {
NS_RELEASE(mInnerWindow);
}
else {
// Get rid of extra reference count
mWindow->Release();
mWindow->Create(aNativeParent, aBounds, nsWebShell::HandleEvent,
mDeviceContext, nsnull);
}
done:
return rv;