зеркало из https://github.com/mozilla/gecko-dev.git
Bug 586566: Fold nsIconDecoder into decoders/bmp. r=dholbert a=blocking
--HG-- rename : modules/libpr0n/decoders/icon/nsIconDecoder.cpp => modules/libpr0n/decoders/bmp/nsIconDecoder.cpp rename : modules/libpr0n/decoders/icon/nsIconDecoder.h => modules/libpr0n/decoders/bmp/nsIconDecoder.h
This commit is contained in:
Родитель
ca56f83bea
Коммит
0cf63d8593
|
@ -76,6 +76,7 @@
|
||||||
// bmp/ico
|
// bmp/ico
|
||||||
#include "nsBMPDecoder.h"
|
#include "nsBMPDecoder.h"
|
||||||
#include "nsICODecoder.h"
|
#include "nsICODecoder.h"
|
||||||
|
#include "nsIconDecoder.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
|
@ -122,6 +123,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGEncoder)
|
||||||
// bmp
|
// bmp
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsICODecoder)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsICODecoder)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBMPDecoder)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBMPDecoder)
|
||||||
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
|
@ -149,6 +151,7 @@ NS_DEFINE_NAMED_CID(NS_JPEGENCODER_CID);
|
||||||
#ifdef IMG_BUILD_DECODER_bmp
|
#ifdef IMG_BUILD_DECODER_bmp
|
||||||
NS_DEFINE_NAMED_CID(NS_ICODECODER_CID);
|
NS_DEFINE_NAMED_CID(NS_ICODECODER_CID);
|
||||||
NS_DEFINE_NAMED_CID(NS_BMPDECODER_CID);
|
NS_DEFINE_NAMED_CID(NS_BMPDECODER_CID);
|
||||||
|
NS_DEFINE_NAMED_CID(NS_ICONDECODER_CID);
|
||||||
#endif
|
#endif
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
NS_DEFINE_NAMED_CID(NS_PNGDECODER_CID);
|
NS_DEFINE_NAMED_CID(NS_PNGDECODER_CID);
|
||||||
|
@ -175,6 +178,7 @@ static const mozilla::Module::CIDEntry kImageCIDs[] = {
|
||||||
#ifdef IMG_BUILD_DECODER_bmp
|
#ifdef IMG_BUILD_DECODER_bmp
|
||||||
{ &kNS_ICODECODER_CID, false, NULL, nsICODecoderConstructor, },
|
{ &kNS_ICODECODER_CID, false, NULL, nsICODecoderConstructor, },
|
||||||
{ &kNS_BMPDECODER_CID, false, NULL, nsBMPDecoderConstructor, },
|
{ &kNS_BMPDECODER_CID, false, NULL, nsBMPDecoderConstructor, },
|
||||||
|
{ &kNS_ICONDECODER_CID, false, NULL, nsIconDecoderConstructor, },
|
||||||
#endif
|
#endif
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
{ &kNS_PNGDECODER_CID, false, NULL, nsPNGDecoderConstructor, },
|
{ &kNS_PNGDECODER_CID, false, NULL, nsPNGDecoderConstructor, },
|
||||||
|
@ -207,6 +211,7 @@ static const mozilla::Module::ContractIDEntry kImageContracts[] = {
|
||||||
{ "@mozilla.org/image/decoder;3?type=image/vnd.microsoft.icon", &kNS_ICODECODER_CID },
|
{ "@mozilla.org/image/decoder;3?type=image/vnd.microsoft.icon", &kNS_ICODECODER_CID },
|
||||||
{ "@mozilla.org/image/decoder;3?type=image/bmp", &kNS_BMPDECODER_CID },
|
{ "@mozilla.org/image/decoder;3?type=image/bmp", &kNS_BMPDECODER_CID },
|
||||||
{ "@mozilla.org/image/decoder;3?type=image/x-ms-bmp", &kNS_BMPDECODER_CID },
|
{ "@mozilla.org/image/decoder;3?type=image/x-ms-bmp", &kNS_BMPDECODER_CID },
|
||||||
|
{ "@mozilla.org/image/decoder;3?type=image/icon", &kNS_ICONDECODER_CID },
|
||||||
#endif
|
#endif
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
{ "@mozilla.org/image/decoder;3?type=image/png", &kNS_PNGDECODER_CID },
|
{ "@mozilla.org/image/decoder;3?type=image/png", &kNS_PNGDECODER_CID },
|
||||||
|
@ -232,6 +237,7 @@ static const mozilla::Module::CategoryEntry kImageCategories[] = {
|
||||||
{ "Gecko-Content-Viewers", "image/vnd.microsoft.icon", "@mozilla.org/content/document-loader-factory;1" },
|
{ "Gecko-Content-Viewers", "image/vnd.microsoft.icon", "@mozilla.org/content/document-loader-factory;1" },
|
||||||
{ "Gecko-Content-Viewers", "image/bmp", "@mozilla.org/content/document-loader-factory;1" },
|
{ "Gecko-Content-Viewers", "image/bmp", "@mozilla.org/content/document-loader-factory;1" },
|
||||||
{ "Gecko-Content-Viewers", "image/x-ms-bmp", "@mozilla.org/content/document-loader-factory;1" },
|
{ "Gecko-Content-Viewers", "image/x-ms-bmp", "@mozilla.org/content/document-loader-factory;1" },
|
||||||
|
{ "Gecko-Content-Viewers", "image/icon", "@mozilla.org/content/document-loader-factory;1" },
|
||||||
#endif
|
#endif
|
||||||
#ifdef IMG_BUILD_DECODER_png
|
#ifdef IMG_BUILD_DECODER_png
|
||||||
{ "Gecko-Content-Viewers", "image/png", "@mozilla.org/content/document-loader-factory;1" },
|
{ "Gecko-Content-Viewers", "image/png", "@mozilla.org/content/document-loader-factory;1" },
|
||||||
|
|
|
@ -50,6 +50,6 @@ MODULE_NAME = nsBMPModule
|
||||||
LIBXUL_LIBRARY = 1
|
LIBXUL_LIBRARY = 1
|
||||||
|
|
||||||
|
|
||||||
CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp
|
CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp nsIconDecoder.cpp
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
|
@ -83,18 +83,6 @@ CPPSRCS = \
|
||||||
nsIconProtocolHandler.cpp \
|
nsIconProtocolHandler.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
|
||||||
USE_ICON_DECODER = 1
|
|
||||||
endif
|
|
||||||
ifeq (,$(filter-out Darwin OS2 BeOS,$(OS_ARCH)))
|
|
||||||
USE_ICON_DECODER = 1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef USE_ICON_DECODER
|
|
||||||
CPPSRCS += nsIconDecoder.cpp
|
|
||||||
DEFINES += -DUSE_ICON_DECODER
|
|
||||||
endif
|
|
||||||
|
|
||||||
XPIDLSRCS = nsIIconURI.idl
|
XPIDLSRCS = nsIIconURI.idl
|
||||||
|
|
||||||
SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
|
SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
|
||||||
|
|
|
@ -40,9 +40,6 @@
|
||||||
#include "mozilla/ModuleUtils.h"
|
#include "mozilla/ModuleUtils.h"
|
||||||
#include "nsServiceManagerUtils.h"
|
#include "nsServiceManagerUtils.h"
|
||||||
|
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
#include "nsIconDecoder.h"
|
|
||||||
#endif
|
|
||||||
#include "nsIconProtocolHandler.h"
|
#include "nsIconProtocolHandler.h"
|
||||||
#include "nsIconURI.h"
|
#include "nsIconURI.h"
|
||||||
#include "nsIconChannel.h"
|
#include "nsIconChannel.h"
|
||||||
|
@ -53,38 +50,21 @@
|
||||||
*/
|
*/
|
||||||
#define NS_ICONPROTOCOL_CID { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } }
|
#define NS_ICONPROTOCOL_CID { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } }
|
||||||
|
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
|
|
||||||
#endif
|
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
|
||||||
|
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
static const char gIconMimeType[] = "image/icon";
|
|
||||||
NS_DEFINE_NAMED_CID(NS_ICONDECODER_CID);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
NS_DEFINE_NAMED_CID(NS_ICONPROTOCOL_CID);
|
NS_DEFINE_NAMED_CID(NS_ICONPROTOCOL_CID);
|
||||||
|
|
||||||
static const mozilla::Module::CIDEntry kIconCIDs[] = {
|
static const mozilla::Module::CIDEntry kIconCIDs[] = {
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
{ &kNS_ICONDECODER_CID, false, NULL, nsIconDecoderConstructor },
|
|
||||||
#endif
|
|
||||||
{ &kNS_ICONPROTOCOL_CID, false, NULL, nsIconProtocolHandlerConstructor },
|
{ &kNS_ICONPROTOCOL_CID, false, NULL, nsIconProtocolHandlerConstructor },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
static const mozilla::Module::ContractIDEntry kIconContracts[] = {
|
static const mozilla::Module::ContractIDEntry kIconContracts[] = {
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
{ "@mozilla.org/image/decoder;3?type=image/icon", &kNS_ICONDECODER_CID },
|
|
||||||
#endif
|
|
||||||
{ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "moz-icon", &kNS_ICONPROTOCOL_CID },
|
{ NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "moz-icon", &kNS_ICONPROTOCOL_CID },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
static const mozilla::Module::CategoryEntry kIconCategories[] = {
|
static const mozilla::Module::CategoryEntry kIconCategories[] = {
|
||||||
#ifdef USE_ICON_DECODER
|
|
||||||
{ "Gecko-Content-Viewers", gIconMimeType, "@mozilla.org/content/document-loader-factory;1" },
|
|
||||||
#endif
|
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче