Bug 394485: Prevent loading blocklisted urls loaded from <object> tags. r=jonas, sr=biesi, blocking1.9=stuart

2008-03-12 14:52:47 -07:00
parent 8e890fd9d1
commit 1d8a0829d7
8 changed files with 186 additions and 17 deletions
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -100,6 +100,7 @@ Shutdown(nsIModule* aSelf)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWebShell, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDefaultURIFixup)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWebNavigationInfo, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsClassifierCallback)

 // uriloader
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsURILoader)
@@ -149,6 +150,12 @@ static const nsModuleComponentInfo gDocShellModuleInfo[] = {
      NS_WEBNAVIGATION_INFO_CONTRACTID,
      nsWebNavigationInfoConstructor
    },
+    {
+      "Channel classifier",
+      NS_CHANNELCLASSIFIER_CID,
+      NS_CHANNELCLASSIFIER_CONTRACTID,
+      nsClassifierCallbackConstructor
+    },

    // about redirector
    { "about:config",