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

Now that we have decided that there is only one docshell for all content types, we needed to get rid of the base class/ content type implementation. This checkin takes and moves the nsDocShellBase to be nsDocShell. It now holds the nsIHTMLDocShell stuff. This will be going away. nsCDocShell was created to replace the previous nsCHTMLDocShell.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@53337 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
1999-11-12 07:28:25 +00:00
parent 45fc90e1a6
commit 59bdeee953
15 changed files with 565 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/docshell/build/nsDocShellModule.cpp
View File

@@ -24,10 +24,10 @@
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsHTMLDocShell.h"
#include "nsDocShell.h"
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kHTMLDocShellCID, NS_HTML_DOCSHELL_CID);
static NS_DEFINE_CID(kDocShellCID, NS_DOCSHELL_CID);
//*****************************************************************************
//*** Library Exports
@@ -45,8 +45,8 @@ NSGetFactory(nsISupports* aServMgr,
nsIGenericFactory* fact;
if(aClass.Equals(kHTMLDocShellCID))
rv = NS_NewGenericFactory(&fact, nsHTMLDocShell::Create);
if(aClass.Equals(kDocShellCID))
rv = NS_NewGenericFactory(&fact, nsDocShell::Create);
else
rv = NS_NOINTERFACE;
@@ -62,9 +62,9 @@ NSRegisterSelf(nsISupports* aServMgr , const char* aPath)
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->RegisterComponent(kHTMLDocShellCID,
"nsHTMLDocShell",
NS_HTML_DOCSHELL_PROGID,
rv = compMgr->RegisterComponent(kDocShellCID,
"nsDocShell",
NS_DOCSHELL_PROGID,
aPath, PR_TRUE, PR_TRUE);
NS_ENSURE_SUCCESS(rv, rv);
@@ -78,7 +78,7 @@ NSUnregisterSelf(nsISupports* aServMgr, const char* aPath)
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServMgr, kComponentManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = compMgr->UnregisterComponent(kHTMLDocShellCID, aPath);
rv = compMgr->UnregisterComponent(kDocShellCID, aPath);
NS_ENSURE_SUCCESS(rv, rv);
return rv;