corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 490957. Eliminate nsWebShell. r+sr=bsmedberg

Browse Source
This commit is contained in:
Boris Zbarsky
2009-05-07 15:21:53 -04:00
parent bad1bc1bd8
commit a9c9ed852d
31 changed files with 1344 additions and 1731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
docshell/build/nsDocShellModule.cpp
View File

@@ -42,7 +42,7 @@
#include "nsDocShellCID.h"
#include "nsWebShell.h"
#include "nsDocShell.h"
#include "nsDefaultURIFixup.h"
#include "nsWebNavigationInfo.h"
@@ -100,7 +100,7 @@ Shutdown(nsIModule* aSelf)
}
// docshell
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWebShell, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDocShell, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDefaultURIFixup)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWebNavigationInfo, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClassifierCallback)
@@ -132,19 +132,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSHistory)
// download history
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadHistory)
// Currently no-one is instantiating docshell's directly because
// nsWebShell is still our main "shell" class. nsWebShell is a subclass
// of nsDocShell. Once migration is complete, docshells will be the main
// "shell" class and this module will need to register the docshell as
// a component
//NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocShell)
static const nsModuleComponentInfo gDocShellModuleInfo[] = {
// docshell
{ "WebShell",
NS_WEB_SHELL_CID,
"@mozilla.org/webshell;1",
nsWebShellConstructor
{ "DocShell",
NS_DOCSHELL_CID,
"@mozilla.org/docshell;1",
nsDocShellConstructor
},
{ "Default keyword fixup",
NS_DEFAULTURIFIXUP_CID,