From c27d88c2510181e103061a5c28f6cd04e62c9386 Mon Sep 17 00:00:00 2001 From: "timeless%mac.com" Date: Tue, 18 Dec 2001 13:40:06 +0000 Subject: [PATCH] Bug 115594 Support .CUR files patch by cbiesinger@web.de r=pavlov sr=tor --- layout/generic/nsObjectFrame.cpp | 2 ++ layout/html/base/src/nsObjectFrame.cpp | 2 ++ netwerk/mime/src/nsXMLMIMEDataSource.cpp | 4 +--- uriloader/exthandler/nsExternalHelperAppService.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 68b0afdb569e..92736c9518bc 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -383,6 +383,7 @@ nsObjectFrame::GetSkipSides() const #define IMAGE_EXT_XBM "xbm" #define IMAGE_EXT_BMP "bmp" #define IMAGE_EXT_ICO "ico" +#define IMAGE_EXT_CUR "cur" #define IMAGE_EXT_MNG "mng" #define IMAGE_EXT_JNG "jng" @@ -447,6 +448,7 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) ext.EqualsIgnoreCase(IMAGE_EXT_XBM) || ext.EqualsIgnoreCase(IMAGE_EXT_BMP) || ext.EqualsIgnoreCase(IMAGE_EXT_ICO) || + ext.EqualsIgnoreCase(IMAGE_EXT_CUR) || ext.EqualsIgnoreCase(IMAGE_EXT_MNG) || ext.EqualsIgnoreCase(IMAGE_EXT_JNG)) { diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index 68b0afdb569e..92736c9518bc 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -383,6 +383,7 @@ nsObjectFrame::GetSkipSides() const #define IMAGE_EXT_XBM "xbm" #define IMAGE_EXT_BMP "bmp" #define IMAGE_EXT_ICO "ico" +#define IMAGE_EXT_CUR "cur" #define IMAGE_EXT_MNG "mng" #define IMAGE_EXT_JNG "jng" @@ -447,6 +448,7 @@ void nsObjectFrame::IsSupportedImage(nsIContent* aContent, PRBool* aImage) ext.EqualsIgnoreCase(IMAGE_EXT_XBM) || ext.EqualsIgnoreCase(IMAGE_EXT_BMP) || ext.EqualsIgnoreCase(IMAGE_EXT_ICO) || + ext.EqualsIgnoreCase(IMAGE_EXT_CUR) || ext.EqualsIgnoreCase(IMAGE_EXT_MNG) || ext.EqualsIgnoreCase(IMAGE_EXT_JNG)) { diff --git a/netwerk/mime/src/nsXMLMIMEDataSource.cpp b/netwerk/mime/src/nsXMLMIMEDataSource.cpp index b7a5d8ad1147..b235069b467c 100644 --- a/netwerk/mime/src/nsXMLMIMEDataSource.cpp +++ b/netwerk/mime/src/nsXMLMIMEDataSource.cpp @@ -499,12 +499,10 @@ nsXMLMIMEDataSource::InitFromHack() { rv = AddMapping(IMAGE_BMP, "bmp", "BMP Image", nsnull); if (NS_FAILED(rv)) return rv; - rv = AppendExtension(IMAGE_BMP, "bmp"); - if (NS_FAILED(rv)) return rv; rv = AddMapping(IMAGE_ICO, "ico", "ICO Image", nsnull); if (NS_FAILED(rv)) return rv; - rv = AppendExtension(IMAGE_ICO, "ico"); + rv = AppendExtension(IMAGE_ICO, "cur"); if (NS_FAILED(rv)) return rv; rv = AddMapping(IMAGE_PNG, "png", "PNG Image", nsnull); diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 9fb7bfa97038..410a7cfe6025 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -106,7 +106,7 @@ static nsDefaultMimeTypeEntry defaultMimeEntries [] = { IMAGE_JPG, "jpeg,jpg", "JPEG Image", 0, 0 }, { IMAGE_PNG, "png", "PNG Image", 0, 0 }, { IMAGE_BMP, "bmp", "BMP Image", 0, 0 }, - { IMAGE_ICO, "ico", "ICO Image", 0, 0 }, + { IMAGE_ICO, "ico,cur", "ICO Image", 0, 0 }, { IMAGE_MNG, "mng", "MNG Image", 0, 0 }, { IMAGE_JNG, "jng", "JNG Image", 0, 0 }, { APPLICATION_XPINSTALL, "xpi", "XPInstall Install", 'xpi*','MOSS' },