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

97324 r=peterl/jst sr=jst/bz nsContentDLF.cpp should not use a static list of image types; also: 192023 Make DocLoaderFactories a service

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138608 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2003-02-27 13:51:55 +00:00
parent 30116951cd
commit 2ce1496a15
14 changed files with 291 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
mozilla/modules/libpr0n/build/nsImageModule.cpp
View File

@@ -32,6 +32,9 @@
#include "nsIGenericFactory.h"
#include "nsIModule.h"
#include "nsICategoryManager.h"
#include "nsXPCOMCID.h"
#include "nsIServiceManagerUtils.h"
#include "imgCache.h"
#include "imgContainer.h"
@@ -110,6 +113,66 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsXBMDecoder)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder)
#endif
static const char* gImageMimeTypes[] = {
#ifdef IMG_BUILD_gif
"image/gif",
#endif
#ifdef IMG_BUILD_jpeg
"image/jpeg",
"image/pjpeg",
"image/jpg",
#endif
#ifdef IMG_BUILD_bmp
"image/x-icon",
"image/bmp",
#endif
#ifdef IMB_BUILD_png
"image/png",
"image/x-png",
#endif
#ifdef IMG_BUILD_xbm
"image/x-xbitmap",
"image/x-xbm",
"image/xbm",
#endif
#ifdef IMG_BUILD_ppm
"image/x-portable-bitmap",
"image/x-portable-graymap",
"image/x-portable-pixmap"
#endif
};
static NS_METHOD ImageRegisterProc(nsIComponentManager *aCompMgr,
nsIFile *aPath,
const char *registryLocation,
const char *componentType,
const nsModuleComponentInfo *info) {
nsresult rv;
nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
for (int i = 0; i < sizeof(gImageMimeTypes)/sizeof(*gImageMimeTypes); i++) {
catMan->AddCategoryEntry("Gecko-Content-Viewers", gImageMimeTypes[i],
"@mozilla.org/content/document-loader-factory;1",
PR_TRUE, PR_TRUE, nsnull);
}
return NS_OK;
}
static NS_METHOD ImageUnregisterProc(nsIComponentManager *aCompMgr,
nsIFile *aPath,
const char *registryLocation,
const nsModuleComponentInfo *info) {
nsresult rv;
nsCOMPtr<nsICategoryManager> catMan(do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv));
if (NS_FAILED(rv))
return rv;
for (int i = 0; i < sizeof(gImageMimeTypes)/sizeof(*gImageMimeTypes); i++)
catMan->DeleteCategoryEntry("Gecko-Content-Viewers", gImageMimeTypes[i], PR_TRUE);
return NS_OK;
}
static const nsModuleComponentInfo components[] =
{
{ "image cache",
@@ -123,7 +186,9 @@ static const nsModuleComponentInfo components[] =
{ "image loader",
NS_IMGLOADER_CID,
"@mozilla.org/image/loader;1",
imgLoaderConstructor, },
imgLoaderConstructor,
ImageRegisterProc, /* register the decoder mime types here */
ImageUnregisterProc, },
{ "image request proxy",
NS_IMGREQUESTPROXY_CID,
"@mozilla.org/image/request;1",