Bug 658391 - Move nsStructuredCloneContainer's definition out of nsDocShellModule and into nsLayoutModule. r=khuey

This commit is contained in:
Justin Lebar
2011-05-20 08:37:02 -04:00
parent 13f580df46
commit d348821ee5
2 changed files with 5 additions and 7 deletions

View File

@@ -72,8 +72,6 @@
// download history
#include "nsDownloadHistory.h"
#include "nsStructuredCloneContainer.h"
static PRBool gInitialized = PR_FALSE;
// The one time initialization for this module
@@ -133,8 +131,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSHistory)
// download history
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadHistory)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsStructuredCloneContainer)
NS_DEFINE_NAMED_CID(NS_DOCSHELL_CID);
NS_DEFINE_NAMED_CID(NS_DEFAULTURIFIXUP_CID);
NS_DEFINE_NAMED_CID(NS_WEBNAVIGATION_INFO_CID);
@@ -162,7 +158,6 @@ NS_DEFINE_NAMED_CID(NS_SHTRANSACTION_CID);
NS_DEFINE_NAMED_CID(NS_SHISTORY_CID);
NS_DEFINE_NAMED_CID(NS_SHISTORY_INTERNAL_CID);
NS_DEFINE_NAMED_CID(NS_DOWNLOADHISTORY_CID);
NS_DEFINE_NAMED_CID(NS_STRUCTUREDCLONECONTAINER_CID);
const mozilla::Module::CIDEntry kDocShellCIDs[] = {
@@ -193,7 +188,6 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = {
{ &kNS_SHISTORY_CID, false, NULL, nsSHistoryConstructor },
{ &kNS_SHISTORY_INTERNAL_CID, false, NULL, nsSHistoryConstructor },
{ &kNS_DOWNLOADHISTORY_CID, false, NULL, nsDownloadHistoryConstructor },
{ &kNS_STRUCTUREDCLONECONTAINER_CID, false, NULL, nsStructuredCloneContainerConstructor },
{ NULL }
};
@@ -242,7 +236,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
{ NS_SHISTORY_CONTRACTID, &kNS_SHISTORY_CID },
{ NS_SHISTORY_INTERNAL_CONTRACTID, &kNS_SHISTORY_INTERNAL_CID },
{ NS_DOWNLOADHISTORY_CONTRACTID, &kNS_DOWNLOADHISTORY_CID },
{ NS_STRUCTUREDCLONECONTAINER_CONTRACTID, &kNS_STRUCTUREDCLONECONTAINER_CID },
{ NULL }
};