diff --git a/uriloader/build/nsURILoaderModule.cpp b/uriloader/build/nsURILoaderModule.cpp
index 6e75200d534..5dd68833425 100644
--- a/uriloader/build/nsURILoaderModule.cpp
+++ b/uriloader/build/nsURILoaderModule.cpp
@@ -40,11 +40,7 @@
#include "nsDocLoader.h"
#include "nsOSHelperAppService.h"
#include "nsExternalProtocolHandler.h"
-
-#if !defined(XP_MAC)
#include "nsPrefetchService.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init)
-#endif
////////////////////////////////////////////////////////////////////////
// Define the contructor function for the objects
@@ -55,6 +51,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsURILoader)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsDocLoaderImpl, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOSHelperAppService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalProtocolHandler)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init)
////////////////////////////////////////////////////////////////////////
// Define a table of CIDs implemented by this module along with other
@@ -74,10 +71,8 @@ static const nsModuleComponentInfo components[] = {
nsOSHelperAppServiceConstructor, },
{ "Netscape Default Protocol Handler", NS_EXTERNALPROTOCOLHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"default",
nsExternalProtocolHandlerConstructor, },
-#if !defined(XP_MAC)
{ NS_PREFETCHSERVICE_CLASSNAME, NS_PREFETCHSERVICE_CID, NS_PREFETCHSERVICE_CONTRACTID,
nsPrefetchServiceConstructor, nsPrefetchService::RegisterProc, nsPrefetchService::UnregisterProc },
-#endif
};
diff --git a/uriloader/macbuild/uriLoader.xml b/uriloader/macbuild/uriLoader.xml
index 874ba24b7d3..0ab6fe894d6 100644
--- a/uriloader/macbuild/uriLoader.xml
+++ b/uriloader/macbuild/uriLoader.xml
@@ -125,6 +125,16 @@
FrameworkPathfalse
HostFlagsAll
+
+ SearchPath
+ Path::prefetch:
+ PathFormatMacOS
+ PathRootProject
+
+ Recursivetrue
+ FrameworkPathfalse
+ HostFlagsAll
+
SystemSearchPaths
@@ -1048,6 +1058,13 @@
Library
Debug
+
+ Name
+ nsPrefetchService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -1120,6 +1137,11 @@
UnicharUtilsStaticDebug.o
MacOS
+
+ Name
+ nsPrefetchService.cpp
+ MacOS
+
@@ -1194,6 +1216,16 @@
FrameworkPathfalse
HostFlagsAll
+
+ SearchPath
+ Path::prefetch:
+ PathFormatMacOS
+ PathRootProject
+
+ Recursivetrue
+ FrameworkPathfalse
+ HostFlagsAll
+
SystemSearchPaths
@@ -2117,6 +2149,13 @@
Library
Debug
+
+ Name
+ nsPrefetchService.cpp
+ MacOS
+ Text
+ Debug
+
@@ -2189,6 +2228,11 @@
UnicharUtilsStatic.o
MacOS
+
+ Name
+ nsPrefetchService.cpp
+ MacOS
+
@@ -2199,6 +2243,14 @@
+ prefetch
+
+ uriLoaderDebug.shlb
+ Name
+ nsPrefetchService.cpp
+ MacOS
+
+
exthandler
uriLoaderDebug.shlb
diff --git a/uriloader/macbuild/uriLoaderIDL.xml b/uriloader/macbuild/uriLoaderIDL.xml
index 749fe7e89ba..8c959e2c711 100644
--- a/uriloader/macbuild/uriLoaderIDL.xml
+++ b/uriloader/macbuild/uriLoaderIDL.xml
@@ -95,6 +95,16 @@
FrameworkPathfalse
HostFlagsAll
+
+ SearchPath
+ Path::prefetch:
+ PathFormatMacOS
+ PathRootProject
+
+ Recursivetrue
+ FrameworkPathfalse
+ HostFlagsAll
+
SystemSearchPaths
@@ -797,6 +807,13 @@
Text
+
+ Name
+ nsIPrefetchService.idl
+ MacOS
+ Text
+
+
@@ -854,6 +871,11 @@
nsIDownload.idl
MacOS
+
+ Name
+ nsIPrefetchService.idl
+ MacOS
+
@@ -898,6 +920,16 @@
FrameworkPathfalse
HostFlagsAll
+
+ SearchPath
+ Path::prefetch:
+ PathFormatMacOS
+ PathRootProject
+
+ Recursivetrue
+ FrameworkPathfalse
+ HostFlagsAll
+
SystemSearchPaths
@@ -1600,6 +1632,13 @@
Text
+
+ Name
+ nsIPrefetchService.idl
+ MacOS
+ Text
+
+
@@ -1657,6 +1696,11 @@
nsIDownload.idl
MacOS
+
+ Name
+ nsIPrefetchService.idl
+ MacOS
+
@@ -1733,6 +1777,12 @@
nsIDownload.idl
MacOS
+
+ headers
+ Name
+ nsIPrefetchService.idl
+ MacOS
+
diff --git a/uriloader/prefetch/MANIFEST_IDL b/uriloader/prefetch/MANIFEST_IDL
new file mode 100644
index 00000000000..e69de29bb2d