Added the memstream file.

git-svn-id: svn://10.0.0.236/branches/NuCache_BRANCH@9000 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/config/config.mak

@@ -0,0 +1,408 @@
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+!if !defined(CONFIG_CONFIG_MAK)
+CONFIG_CONFIG_MAK=1
+
+#//------------------------------------------------------------------------
+#//
+#// Define public make variables:
+#//
+#//    OBJDIR  - Specifies the location of intermediate files (ie. objs...)
+#//              Currently, the names are WINxx_O.OBJ or WINxx_D.OBJ for
+#//              optimized and debug builds respectively.
+#//
+#//    DIST    - Specifies the location of the distribution directory where
+#//              all targets are delivered.
+#//
+#//    CFGFILE - Specifies the name of the temporary configuration file 
+#//              containing the arguments to the current command.
+#//
+#//    INCS    - Default include paths.
+#//
+#//    CFLAGS  - Default compiler options.
+#//
+#//    LFLAGS  - Default linker options.
+#//
+#//------------------------------------------------------------------------
+
+!if [$(MOZ_TOOLS)\bin\uname > osuname.inc]
+!endif
+WINOS=\
+!include "osuname.inc"
+WINOS=$(WINOS: =)^
+
+!if [del osuname.inc]
+!endif
+
+## Include support for MOZ_LITE/MOZ_MEDIUM
+include <$(DEPTH)/config/liteness.mak>
+
+!if "$(MOZ_BITS)" == "16"
+
+!if "$(MAKE_OBJ_TYPE)" == "DLL"
+OBJTYPE=D
+!else
+OBJTYPE=E
+!endif
+
+!else
+OBJTYPE=
+!endif
+
+XPDIST=$(DEPTH)\dist
+PUBLIC=$(XPDIST)\public
+
+#//-----------------------------------------------------------------------
+#// OBJDIR is NOT the same as DIST for Win16. The Win16 dist stuff can
+#// be built with EXE or DLL compiler flags, but the DIST directory
+#// has the same name no matter what
+#//-----------------------------------------------------------------------
+
+
+!ifdef NGLAYOUT_BUILD_PREFIX
+DIST_PREFIX=NGL
+!else
+!ifdef MOZ_NAV_BUILD_PREFIX
+DIST_PREFIX=NAV
+!else
+DIST_PREFIX=WIN
+!endif
+!endif
+
+!ifndef MOZ_DEBUG
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_O.OBJ
+JAVA_OPTIMIZER = -O
+!ifdef NO_CAFE
+JAVAC_OPTIMIZER =
+!else
+#JAVAC_OPTIMIZER= -O -noinline
+JAVAC_OPTIMIZER =
+!endif
+!else
+OBJDIR=$(DIST_PREFIX)$(MOZ_BITS)$(OBJTYPE)_D.OBJ
+JAVA_OPTIMIZER = -g
+JAVAC_OPTIMIZER = -g
+!endif
+
+#//
+#// DIST DEFINES SHOULD NEVER BE COMPONENT SPECIFIC.
+#//
+!ifndef MOZ_DEBUG
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_O.OBJ
+!else
+DIST=$(XPDIST)\$(DIST_PREFIX)$(MOZ_BITS)_D.OBJ
+!endif
+
+# This will always give the location of NGLayout's dist, even if "NGLAYOUT_BUILD_PREFIX" is not defined.
+!if defined(MOZ_NGLAYOUT)
+!ifndef MOZ_DEBUG
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_O.OBJ
+!else
+NGLAYOUT_DIST=$(XPDIST)\NGL$(MOZ_BITS)_D.OBJ
+!endif
+!endif
+
+
+CFGFILE=$(OBJDIR)\cmd.cfg
+
+!if "$(MOZ_BITS)" == "16"
+INCS=-I$(XPDIST)\public\win16 $(INCS) -I$(DEPTH)\include -I$(DIST)\include -I..\include
+!else
+INCS=$(INCS) -I$(DEPTH)\include -I$(DIST)\include \
+             -I$(XPDIST)\public\img -I$(XPDIST)\public\util \
+             -I$(XPDIST)\public\coreincl
+!endif # 16
+
+!ifndef NO_LAYERS
+INCS=$(INCS) -I$(DEPTH)\lib\liblayer\include
+!endif 
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+LCFLAGS=$(LCFLAGS) -DSTAND_ALONE_JAVA
+!endif
+
+!if defined(MOZ_JAVA)
+MOZ_JAVA_FLAG=-DJAVA
+!if defined(MOZ_OJI)
+!error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+!endif
+JAVA_OR_OJI=1
+!endif
+
+!if defined(MOZ_OJI)
+LCFLAGS=$(LCFLAGS) -DOJI
+JAVA_OR_OJI=1
+!endif
+
+# Perhaps we should add MOZ_LITENESS_FLAGS to 16 bit build
+!if "$(MOZ_BITS)" == "16"
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS -DEDITOR $(OS_CFLAGS) $(MOZ_CFLAGS)
+!else
+CFLAGS=$(MOZ_JAVA_FLAG) -DMOCHA -DLAYERS $(OS_CFLAGS) $(MOZ_CFLAGS) $(MOZ_LITENESS_FLAGS)
+!endif
+LFLAGS=$(OS_LFLAGS) $(LLFLAGS) $(MOZ_LFLAGS)
+
+!ifdef NO_SECURITY
+CFLAGS = $(CFLAGS) -DNO_SECURITY
+!endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+!if "$(MOZ_BITS)"=="32" || defined(MOZ_DEBUG)
+CFLAGS = $(CFLAGS) -DDEVELOPER_DEBUG
+!endif
+
+!ifdef STANDALONE_IMAGE_LIB
+CFLAGS=$(CFLAGS) -DSTANDALONE_IMAGE_LIB
+!endif
+
+!ifdef MODULAR_NETLIB
+CFLAGS=$(CFLAGS) -DMODULAR_NETLIB
+!else
+# Defines for new cookie management...
+CFLAGS=$(CFLAGS) -DCookieManagement -DSingleSignon
+
+!endif
+
+# TODO Remove later - Gagan
+!ifdef NU_CACHE 
+CFLAGS=$(CFLAGS) -DNU_CACHE
+!endif
+
+# always need these:
+CFLAGS = $(CFLAGS) -DNETSCAPE
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+!if defined(SERVER_BUILD)
+CFLAGS = $(CFLAGS) -DSERVER_BUILD
+!elseif defined(LIVEWIRE)
+CFLAGS = $(CFLAGS) -DLIVEWIRE
+!else
+CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT
+!endif
+
+PERL= $(MOZ_TOOLS)\perl5\perl.exe
+MASM = $(MOZ_TOOLS)\bin\ml.exe
+
+!if "$(WINOS)" == "WIN95"
+MKDIR = $(DEPTH)\config\w95mkdir
+QUIET =
+!else
+MKDIR = mkdir
+QUIET=@
+!endif
+
+
+#//------------------------------------------------------------------------
+#//
+#// Include the OS dependent configuration information
+#//
+#//------------------------------------------------------------------------
+include <$(DEPTH)/config/WIN$(MOZ_BITS)>
+
+!ifdef MOZ_DEBUG
+!ifdef USERNAME
+CFLAGS = $(CFLAGS) -DDEBUG_$(USERNAME)
+!endif
+!if defined(GLOWCODE) && defined(GLOWPROF) && "$(MOZ_BITS)"=="32"
+CFLAGS = $(CFLAGS) -Gh
+!endif
+!endif
+
+#//------------------------------------------------------------------------
+#//
+#// Define the global make commands.
+#//
+#//    MAKE_INSTALL  - Copy a target to the distribution directory.
+#//
+#//    MAKE_OBJDIRS  - Create an object directory (if necessary).
+#//
+#//     MAKE_MANGLE   - Convert all long filenames into 8.3 names
+#//
+#//     MAKE_UNMANGLE - Restore all long filenames
+#//
+#//------------------------------------------------------------------------
+!if !defined(MOZ_SRC)
+#enable builds on any drive if defined.
+MOZ_SRC=y:
+!endif
+MAKE_INSTALL=$(QUIET)$(DEPTH)\config\makecopy.exe
+MAKE_MANGLE=$(DEPTH)\config\mangle.exe
+MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat
+
+#//------------------------------------------------------------------------
+#//
+#// Common Libraries
+#//
+#//------------------------------------------------------------------------
+!ifdef NSPR20
+!if "$(MOZ_BITS)" == "16"
+LIBNSPR=$(DIST)\lib\nspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\msgc21.lib
+!else
+LIBNSPR=$(DIST)\lib\libnspr21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib
+LIBNSPR=$(LIBNSPR) $(DIST)\lib\libmsgc21.lib
+!endif
+!else
+LIBNSPR=$(DIST)\lib\pr$(MOZ_BITS)$(VERSION_NUMBER).lib
+!endif
+
+!ifdef NSPR20
+NSPRDIR = nsprpub
+CFLAGS = $(CFLAGS) -DNSPR20
+!else
+NSPRDIR = nspr
+!endif
+
+LIBJPEG=$(DIST)\lib\jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib
+
+######################################################################
+### Windows-Specific Java Stuff
+
+PATH_SEPARATOR = ;
+
+# where the bytecode will go
+!if "$(AWT_11)" == "1"
+JAVA_DESTPATH = $(DEPTH)\dist\classes11
+!else
+JAVA_DESTPATH = $(DEPTH)\dist\classes
+!endif
+
+# where the source are
+DEFAULT_JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc
+!ifndef JAVA_SOURCEPATH
+!if "$(AWT_11)" == "1"
+JAVA_SOURCEPATH = $(DEPTH)\sun-java\classsrc11;$(DEFAULT_JAVA_SOURCEPATH)
+!else
+JAVA_SOURCEPATH = $(DEFAULT_JAVA_SOURCEPATH)
+!endif
+!endif
+
+JAVA_PROG=$(MOZ_TOOLS)\bin\java.exe
+#JAVA_PROG=$(DIST)\bin\java
+
+JAVAC_ZIP=$(MOZ_TOOLS)/lib/javac.zip
+
+ZIP_PROG = $(MOZ_TOOLS)\bin\zip
+UNZIP_PROG = $(MOZ_TOOLS)\bin\unzip
+ZIP_FLAGS = -0 -r -q
+
+CFLAGS = $(CFLAGS) -DOS_HAS_DLL
+
+DLL_SUFFIX	= dll
+LIB_SUFFIX	= lib
+
+!if "$(STAND_ALONE_JAVA)" == "1"
+STAND_ALONE_JAVA_DLL_SUFFIX=s
+!else
+STAND_ALONE_JAVA_DLL_SUFFIX=
+!endif
+
+MOD_JRT=jrt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_MM =mm$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWT=awt$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_AWTS=awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX)
+MOD_JIT=jit$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JSJ=jsj$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NET=net$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JBN=jbn$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NSC=nsc$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JPW=jpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_JDB=jdb$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZIP=zip$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_ZPW=zpw$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_CON=con$(MOZ_BITS)$(VERSION_NUMBER)
+MOD_NPJ=npj$(MOZ_BITS)$(VERSION_NUMBER)
+
+JRTDLL=$(MOD_JRT).$(DLL_SUFFIX)
+MMDLL =$(MOD_MM).$(DLL_SUFFIX)
+AWTDLL=$(MOD_AWT).$(DLL_SUFFIX)
+AWTSDLL=$(MOD_AWT)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+JITDLL=$(MOD_JIT).$(DLL_SUFFIX)
+JSJDLL=$(MOD_JSJ).$(DLL_SUFFIX)
+NETDLL=$(MOD_NET).$(DLL_SUFFIX)
+JBNDLL=$(MOD_JBN).$(DLL_SUFFIX)
+NSCDLL=$(MOD_NSC).$(DLL_SUFFIX)
+JPWDLL=$(MOD_JPW).$(DLL_SUFFIX)
+JDBDLL=$(MOD_JDB).$(DLL_SUFFIX)
+ZIPDLL=$(MOD_ZIP).$(DLL_SUFFIX)
+ZPWDLL=$(MOD_ZPW).$(DLL_SUFFIX)
+CONDLL=$(MOD_CON).$(DLL_SUFFIX)
+NPJDLL=$(MOD_NPJ).$(DLL_SUFFIX)
+
+ZIPLIB=$(DIST)\lib\$(MOD_ZIP).$(LIB_SUFFIX)
+AWTLIB=$(DIST)\lib\$(MOD_AWT).$(LIB_SUFFIX)
+
+######################################################################
+
+include <$(DEPTH)/config/common.mk>
+
+JAVA_DEFINES =			   \
+	-DJAR_NAME=\"$(JAR_NAME)\" \
+	-DJRTDLL=\"$(JRTDLL)\"	   \
+	-DMMDLL=\"$(MMDLL)\"	   \
+	-DAWTDLL=\"$(AWTDLL)\"	   \
+	-DAWTSDLL=\"$(AWTSDLL)\"   \
+	-DJSJDLL=\"$(JSJDLL)\"	   \
+	-DJITDLL=\"$(JITDLL)\"     \
+	-DNETDLL=\"$(NETDLL)\"     \
+	-DJBNDLL=\"$(JBNDLL)\"     \
+	-DNSCDLL=\"$(NSCDLL)\"     \
+	-DJDBDLL=\"$(JDBDLL)\"	   \
+	-DJPWDLL=\"$(JPWDLL)\"     \
+	-DZPWDLL=\"$(ZPWDLL)\"     \
+	-DCONDLL=\"$(CONDLL)\"
+!if "$(MOZ_BITS)" == "16"
+
+# Override JAVA_DEFINES to make command line short for win16.
+# Put any new defines into javadefs.h in ns/sun-java/include.
+# This is to shorten the command line in order not to break Win16.
+
+JAVA_DEFINES = -DJAR_NAME=\"$(JAR_NAME)\" -DMOZ_BITS=\"$(MOZ_BITS)\" -DVERSION_NUMBER=\"$(VERSION_NUMBER)\" -DDLL_SUFFIX=\".$(DLL_SUFFIX)\"   
+
+!endif
+
+!if "$(AWT_11)" == "1"
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_11
+!else
+JAVA_DEFINES = $(JAVA_DEFINES) -DAWT_102
+!endif
+
+
+#JAVA_CLASSPATH = $(JAVA_CLASSPATH:/=\)
+JMCSRCDIR = $(JMCSRCDIR:/=\)
+JAVA_BOOT_CLASSPATH = $(JAVA_BOOT_CLASSPATH:/=\)
+
+NMAKE=nmake -nologo -$(MAKEFLAGS)
+
+########
+#   Get the cwd to prepend to all compiled source
+#       files.  Will allow debugger to automatically find sources
+#       instead of asking for the path info.
+#   Win16 will break if enabled, guess we continue to live in pain
+#       therein.
+########
+!if "$(MOZ_BITS)" == "32"
+CURDIR=$(MAKEDIR)^\
+!endif
+
+!endif # CONFIG_CONFIG_MAK
+

mozilla/config/config.mk

@@ -0,0 +1,632 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# config.mk
+#
+# Determines the platform and builds the macros needed to load the
+# appropriate platform-specific .mk file, then defines all (most?)
+# of the generic macros.
+#
+
+# This wastes time.
+include $(DEPTH)/config/common.mk
+
+#
+# Important internal static macros
+#
+OS_ARCH		:= $(subst /,_,$(shell uname -s))
+OS_RELEASE	:= $(shell uname -r)
+OS_TEST		:= $(shell uname -m)
+
+#
+# Tweak the default OS_ARCH and OS_RELEASE macros as needed.
+#
+ifeq ($(OS_ARCH),AIX)
+OS_RELEASE	:= $(shell uname -v).$(shell uname -r)
+endif
+ifeq ($(OS_ARCH),BSD_386)
+OS_ARCH		:= BSD_OS
+endif
+ifeq ($(OS_ARCH),IRIX64)
+OS_ARCH		:= IRIX
+endif
+ifeq ($(OS_ARCH),UNIX_SV)
+ifneq ($(findstring NCR,$(shell grep NCR /etc/bcheckrc | head -1 )),)
+OS_ARCH		:= NCR
+else
+OS_ARCH		:= UNIXWARE
+OS_RELEASE	:= $(shell uname -v)
+endif
+endif
+ifeq ($(OS_ARCH),ncr)
+OS_ARCH		:= NCR
+endif
+# This is the only way to correctly determine the actual OS version on NCR boxes.
+ifeq ($(OS_ARCH),NCR)
+OS_RELEASE	:= $(shell awk '{print $$3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$$/\2.\3/')
+endif
+ifeq ($(OS_ARCH),UNIX_System_V)
+OS_ARCH		:= NEC
+endif
+ifeq ($(OS_ARCH),QNX)
+OS_RELEASE	:= $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/')
+endif
+ifeq ($(OS_ARCH),SCO_SV)
+OS_ARCH		:= SCOOS
+OS_RELEASE	:= 5.0
+endif
+ifneq (,$(filter SINIX-N SINIX-Y SINIX-Z ReliantUNIX-M,$(OS_ARCH)))
+OS_ARCH		:= SINIX
+OS_TEST		:= $(shell uname -p)
+endif
+ifeq ($(OS_ARCH),UnixWare)
+OS_ARCH		:= UNIXWARE
+endif
+
+#
+# Strip off the excessively long version numbers on these platforms,
+# but save the version to allow multiple versions of the same base
+# platform to be built in the same tree.
+#
+ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OSF1 SunOS,$(OS_ARCH)))
+OS_VERS		:= $(suffix $(OS_RELEASE))
+OS_RELEASE	:= $(basename $(OS_RELEASE))
+OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
+endif
+
+OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
+
+#
+# Personal makefile customizations go in these optional make include files.
+#
+MY_CONFIG	:= $(DEPTH)/config/myconfig.mk
+MY_RULES	:= $(DEPTH)/config/myrules.mk
+
+#
+# Relative pathname from top-of-tree to current source directory
+#
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+REVDEPTH	:= $(DEPTH)/config/revdepth
+SRCDIR		= $(shell $(PERL) $(REVDEPTH).pl $(DEPTH))
+endif
+
+#
+# Define an include-at-most-once flag
+#
+NS_CONFIG_MK	= 1
+
+#
+# Provide the means to easily override our tool directory locations.
+#
+ifdef NETSCAPE_HIERARCHY
+NETSCAPE_BUILD = 1   # Defines XFEPRIVDIR, below.
+CONTRIB_BIN	:= /tools/contrib/bin/
+JAVA_BIN	:= /usr/local/java/bin/
+LOCAL_BIN	:= /usr/local/bin/
+LOCAL_SUN4	:= /usr/local/sun4/bin/
+NS_BIN		:= /tools/ns/bin/
+NS_LIB		:= /tools/ns/lib
+JAVA_LIB	:= /usr/local/netscape/java/lib
+else
+NS_LIB		:= .
+JAVA_LIB	:= .
+endif
+
+# Allow NETSCAPE_BUILD to include XFEPRIVDIR w/o NETSCAPE_HIERARCHY
+ifdef NETSCAPE_BUILD
+XFEPRIVDIR		:= $(DEPTH)/../ns/cmd/xfe/
+endif
+
+#
+# Default command macros; can be overridden in <arch>.mk.
+#
+AS		= $(CC)
+ASFLAGS		= $(CFLAGS)
+BSDECHO		= echo
+CC		= gcc
+CCC		= g++
+CCF		= $(CC) $(CFLAGS)
+LINK_EXE	= $(LINK) $(OS_LFLAGS) $(LFLAGS)
+LINK_DLL	= $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+NFSPWD		= $(DEPTH)/config/nfspwd
+PURIFY		= purify $(PURIFYOPTIONS)
+QUANTIFY	= quantify $(QUANTIFYOPTIONS)
+RANLIB		= /bin/true
+SDKINSTALL	= $(NSINSTALL) -t
+UNZIP_PROG	= $(LOCAL_BIN)/unzip
+ZIP_PROG	= $(LOCAL_BIN)/zip
+ZIP_FLAGS	= -0rq
+
+ifeq ($(OS_ARCH),OS2)
+EMPTY		:=
+SLASH		:= /$(EMPTY)
+BSLASH		:= \$(EMPTY)
+SEMICOLON	:= ;$(EMPTY)
+SPACE		:= $(EMPTY) $(EMPTY)
+PATH_SEPARATOR	:= \;
+RC		= flipper rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+MAP_SUFFIX	= map
+BIN_SUFFIX	= .exe
+AR		= flipper ILibo //noignorecase //nologo $@
+IMPLIB		= flipper ILibo //noignorecase //nologo $@
+DLLFLAGS	= -DLL -OUT:$@ $(XLFLAGS) -MAP:$(@:.dll=.map)
+LFLAGS		= $(OBJS) -OUT:$@ $(XLFLAGS) $(DEPLIBS) $(EXTRA_LIBS) -MAP:$(@:.dll=.map) $(DEF_FILE)
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= flipper java -norestart
+JAVAC_ZIP	= $(subst $(BSLASH),$(SLASH),$(JAVA_HOME))/lib/classes.zip
+else
+ifeq ($(OS_ARCH),WINNT)
+PATH_SEPARATOR	:= :
+RC		= rc$(BIN_SUFFIX)
+XP_DEFINE	= -DXP_PC
+LIB_SUFFIX	= lib
+DLL_SUFFIX	= dll
+BIN_SUFFIX	= .exe
+AR		= lib -NOLOGO -OUT:"$@"
+DLLFLAGS	= $(XLFLAGS) -OUT:"$@"
+LFLAGS		= $(OBJS) $(DEPLIBS) $(EXTRA_LIBS) -OUT:"$@"
+NSINSTALL	= nsinstall
+INSTALL		= $(NSINSTALL)
+JAVA_PROG	= java
+else
+PATH_SEPARATOR	:= :
+XP_DEFINE	= -DXP_UNIX
+AR		= ar cr $@
+DLL_SUFFIX	= so
+LIB_SUFFIX	= a
+ifeq ($(AWT_11),1)
+JAVA_PROG	= $(NS_BIN)java
+JAVAC_ZIP	= $(NS_LIB)/classes.zip
+else
+JAVA_PROG	= $(LOCAL_BIN)java
+JAVAC_ZIP	= $(JAVA_LIB)/javac.zip
+endif
+PERL		= $(NS_BIN)perl
+TAR		= tar
+EMACS		= xemacs
+WHOAMI		= /usr/bin/whoami
+endif
+endif
+
+#
+# Debug by default.
+#
+OBJDIR_TAG	= _DBG
+OPTIMIZER	= -g
+JAVA_OPTIMIZER	= -g
+XBCFLAGS	= -FR$*
+XCFLAGS		= $(LCFLAGS)
+XLFLAGS		= $(LLFLAGS)
+
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -Ti+
+XLFLAGS		+= -DEBUG
+ifdef BUILD_PROFILE
+OPTIMIZER	+= -Gh+ 
+OBJDIR_TAG	= _PRF
+else
+OPTIMIZER	+= -DDEBUG
+ifdef BUILD_MEMDBG
+OPTIMIZER	+= -Tm+ -DXP_OS2_MEMDEBUG=1
+OBJDIR_TAG	= _MEM
+endif
+endif
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -Od -Z7
+JAVA_OPTIMIZER	= $(OPTIMIZER)
+XLFLAGS		+= -DEBUG
+else
+DEFINES		= -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
+endif
+endif
+
+ifdef BUILD_OPT
+OBJDIR_TAG	= _OPT
+XBCFLAGS	=
+ifeq ($(OS_ARCH),OS2)
+OPTIMIZER	= -O+ -Oi -DNDEBUG
+else
+ifeq ($(OS_ARCH),WINNT)
+OPTIMIZER	= -O2
+else
+OPTIMIZER	= -O
+DEFINES		= -UDEBUG -DNDEBUG -DTRIMMED
+endif
+endif
+endif
+
+#
+# XXX For now, we're including $(DEPTH)/include directly instead of
+# getting this stuff from dist. This stuff is old and will eventually
+# be put in the library directories where it belongs so that it can
+# get exported to dist properly.
+#
+INCLUDES	= $(LOCAL_PREINCLUDES) $(MODULE_PREINCLUDES) -I$(DEPTH)/include $(LOCAL_INCLUDES) $(OS_INCLUDES)
+
+LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
+LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
+LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
+
+#
+# NSPR 2.0 is now the default, "setenv NSPR10 1" to go back to 1.0
+#
+ifndef NSPR10
+NSPR20		= 1
+NSPRDIR		= nsprpub
+DEFINES		+= -DNSPR20
+INCLUDES	+= -I$(DIST)/include
+LIBNSPR		= $(DIST)/lib/libplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/libnspr21.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibmsgc21.$(LIB_SUFFIX) \
+		  $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX)
+else
+NSPRDIR		= nspr
+LIBNSPR		= $(DIST)/lib/libnspr.$(LIB_SUFFIX)
+PURELIBNSPR	= $(DIST)/lib/libpurenspr.$(LIB_SUFFIX)
+endif
+
+ifdef DBMALLOC
+LIBNSPR		+= $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)
+endif
+
+ifeq ($(OS_ARCH),OS2)
+LIBNSJAVA	= $(DIST)/lib/jrt$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBMD		= $(DIST)/lib/libjmd.$(LIB_SUFFIX)
+LIBJAVA		= $(DIST)/lib/libjrt.$(LIB_SUFFIX)
+LIBNSPR		= $(DIST)/lib/pr$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
+LIBXP		= $(DIST)/lib/libxp.$(LIB_SUFFIX)
+else
+ifeq ($(OS_ARCH),WINNT)
+LIBNSJAVA	= $(DIST)/lib/jrt3221.$(LIB_SUFFIX)
+else
+LIBNSJAVA	= $(DIST)/lib/nsjava32.$(LIB_SUFFIX)
+endif
+endif
+
+CFLAGS		= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(MDUPDATE_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROF_FLAGS)
+NOMD_CFLAGS	= $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+
+#
+# Include the binary distrib stuff, if necessary.
+#
+ifdef NS_BUILD_CORE
+include $(DEPTH)/config/coreconf.mk
+endif
+
+#
+# Now include the platform-specific stuff.
+#
+include $(DEPTH)/config/$(OS_ARCH).mk
+
+#
+# Some platforms (Solaris) might require builds using either
+# (or both) compiler(s).
+#
+ifdef SHOW_CC_TYPE
+COMPILER	= _$(notdir $(CC))
+endif
+
+#
+# Name of the binary code directories
+#
+ifeq ($(OS_ARCH)_$(PROCESSOR_ARCHITECTURE),WINNT_x86)
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(OBJDIR_TAG).OBJ
+else
+OBJDIR_NAME	= $(OS_CONFIG)$(OS_VERSION)$(PROCESSOR_ARCHITECTURE)$(COMPILER)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+endif
+
+# Figure out where the binary code lives. It either lives in the src
+# tree (NSBUILDROOT is undefined) or somewhere else.
+ifdef NSBUILDROOT
+BUILD		= $(NSBUILDROOT)/$(OBJDIR_NAME)/build
+OBJDIR		= $(BUILD)/$(SRCDIR)
+XPDIST		= $(NSBUILDROOT)
+DIST		= $(NSBUILDROOT)/$(OBJDIR_NAME)/dist
+else
+BUILD		= $(OBJDIR_NAME)
+OBJDIR		= $(OBJDIR_NAME)
+XPDIST		= $(DEPTH)/dist
+DIST		= $(DEPTH)/dist/$(OBJDIR_NAME)
+endif
+
+# all public include files go in subdirectories of PUBLIC:
+PUBLIC		= $(XPDIST)/public
+
+VPATH		= $(OBJDIR)
+DEPENDENCIES	= $(OBJDIR)/.md
+
+ifneq ($(OS_ARCH),WINNT)
+MKDEPEND_DIR	= $(DEPTH)/config/mkdepend
+MKDEPEND	= $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
+MKDEPENDENCIES	= $(OBJDIR)/depend.mk
+endif
+
+#
+# Include any personal overrides the user might think are needed.
+#
+-include $(MY_CONFIG)
+
+######################################################################
+# Now test variables that might have been set or overridden by $(MY_CONFIG).
+
+DEFINES		+= -DNETSCAPE -DOSTYPE=\"$(OS_CONFIG)\"
+
+# Specify that we are building a client.
+# This will instruct the cross platform libraries to
+# include all the client specific cruft.
+ifdef SERVER_BUILD
+DEFINES		+= -DSERVER_BUILD
+ifdef LIVEWIRE
+DEFINES		+= -DLIVEWIRE
+endif
+STATIC_JAVA	= yes
+else
+MOZILLA_CLIENT	= 1
+DEFINES		+= -DMOZILLA_CLIENT
+endif
+
+ifdef MOZ_SINGLESIGNON
+DEFINES		+= -DSingleSignon
+endif
+
+ifdef MOZ_COOKIEMANAGE
+DEFINES		+= -DCookieManagement
+endif
+
+ifdef MOZ_LITE
+NO_EDITOR	= 1
+NO_UNIX_LDAP	= 1
+MOZ_JSD		= 1
+MOZ_NAV_BUILD_PREFIX = 1
+endif
+ifdef MOZ_MEDIUM
+DEFINES		+= -DEDITOR -DMOZ_COMMUNICATOR_IIDS
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+ifndef MOZ_SECURITY
+NO_SECURITY	= 1
+endif
+endif
+ifdef MOZ_DARK
+DEFINES += -DEDITOR -DMOZ_COMMUNICATOR_IIDS -DMOZ_MAIL_NEWS -DMOZ_OFFLINE \
+                   -DMOZ_TASKBAR -DMOZ_LDAP -DMOZ_NEO 
+#-DMOZ_CALENDAR
+EDITOR		= 1
+MOZ_JSD		= 1
+MOZ_COMMUNICATOR_IIDS	= 1
+MOZ_COMMUNICATOR_CONFIG_JS	= 1
+MOZ_COPY_ALL_JARS	= 1
+MOZ_OFFLINE=1
+MOZ_TASKBAR=1
+MOZ_LDAP=1
+MOZ_MAIL_NEWS=1
+#MOZ_CALENDAR=1
+MOZ_NEO=1
+endif
+ifdef MOZ_GOLD
+DEFINES		+= -DGOLD
+BUILD_GOLD	= 1
+endif
+
+ifdef NO_SECURITY
+DEFINES		+= -DNO_SECURITY
+endif
+
+# Crash-reporting system
+ifdef MOZ_FULLCIRCLE
+DEFINES		+= -DMOZ_FULLCIRCLE
+endif
+
+ifdef EDITOR
+DEFINES		+= -DEDITOR -DEDITOR_UI
+BUILD_EDITOR	= 1
+BUILD_EDITOR_UI	= 1
+BUILD_EDT	= 1
+endif
+
+# Build layers by default
+ifndef NO_LAYERS
+DEFINES		+= -DLAYERS
+endif
+
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
+
+ifdef BUILD_UNIX_PLUGINS
+# UNIX_EMBED Should not be needed. For now these two defines go
+# together until I talk with jg.  --dp
+DEFINES		+= -DUNIX_EMBED -DX_PLUGINS
+endif
+
+ifndef NO_UNIX_LDAP
+DEFINES		+= -DUNIX_LDAP
+endif
+
+#
+# Platform dependent switching off of NSPR, JAVA and MOCHA
+#
+ifndef NO_NSPR
+DEFINES		+= -DNSPR
+endif
+
+ifdef MOZ_JAVA
+DEFINES		+= -DJAVA
+ifdef MOZ_OJI
+error You can't define both MOZ_JAVA and MOZ_OJI anymore. 
+endif
+JAVA_OR_OJI	= 1
+endif
+
+ifdef MOZ_OJI
+DEFINES		+= -DOJI
+JAVA_OR_OJI	= 1
+endif
+
+ifdef JAVA_OR_OJI
+MOZ_SMARTUPDATE = 1
+endif
+
+ifndef NO_MOCHA
+DEFINES		+= -DMOCHA
+endif
+
+ifdef FORTEZZA
+DEFINES		+= -DFORTEZZA
+endif
+
+ifdef UNIX_SKIP_ASSERTS
+DEFINES		+= -DUNIX_SKIP_ASSERTS
+endif
+
+ifdef SHACK
+DEFINES		+= -DSHACK
+endif
+
+ifndef NO_UNIX_ASYNC_DNS
+DEFINES		+= -DUNIX_ASYNC_DNS
+endif
+
+# For profiling
+ifdef MOZILLA_GPROF
+# Don't want profiling on build tools..
+ifneq ($(SRCDIR),config)
+PROF_FLAGS	= $(OS_GPROF_FLAGS) -DMOZILLA_GPROF
+endif
+endif
+
+# This compiles in heap dumping utilities and other good stuff 
+# for developers -- maybe we only want it in for a special SDK 
+# nspr/java runtime(?):
+DEFINES		+= -DDEVELOPER_DEBUG
+
+#
+# For the standalone image lib
+#
+ifdef STANDALONE_IMAGE_LIB
+DEFINES		+= -DSTANDALONE_IMAGE_LIB
+endif
+
+ifdef MODULAR_NETLIB
+DEFINES 	+= -DMODULAR_NETLIB
+endif
+
+######################################################################
+
+GARBAGE		= $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+
+ifndef SDK
+SDK		= $(DEPTH)/dist/sdk
+endif
+
+ifneq ($(OS_ARCH),WINNT)
+NSINSTALL	= $(DEPTH)/config/$(OBJDIR_NAME)/nsinstall
+
+ifeq ($(NSDISTMODE),copy)
+# copy files, but preserve source mtime
+INSTALL		= $(NSINSTALL) -t
+else
+ifeq ($(NSDISTMODE),absolute_symlink)
+# install using absolute symbolic links
+INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
+else
+# install using relative symbolic links
+INSTALL		= $(NSINSTALL) -R
+endif
+endif
+endif
+
+######################################################################
+### Java Stuff - see common.mk
+######################################################################
+
+# where the bytecode will go
+JAVA_DESTPATH	= $(XPDIST)/classes
+
+# where the sources for the module you are compiling are
+# default is sun-java/classsrc, override for other modules
+ifndef JAVA_SOURCEPATH
+JAVA_SOURCEPATH	= $(DEPTH)/sun-java/classsrc
+endif
+
+ifndef JAVAH_IN_JAVA
+ifeq ($(OS_ARCH),OS2)
+JAVAH_PROG	= flipper $(DIST)/bin/javah
+else
+JAVAH_PROG	= $(DIST)/bin/javah
+endif
+else
+JAVAH_PROG	= $(JAVA) netscape.tools.jric.Main
+endif
+
+ifeq ($(STAND_ALONE_JAVA),1)
+STAND_ALONE_JAVA_DLL_SUFFIX	= s
+endif
+
+ifeq ($(OS_ARCH),OS2)
+AWTDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+AWTSDLL		= awt$(MOZ_BITS)$(VERSION_NUMBER)$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= con.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JBNDLL		= jbn.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JDBCDLL		= jdb.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JITDLL		= jit.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JPWDLL		= jpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+JRTDLL		= jrt$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+JSJDLL		= jsj.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+MMDLL		= mm$(MOZ_BITS)$(VERSION_NUMBER).$(DLL_SUFFIX)
+NETDLL		= net.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+NSCDLL		= nsc.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZIPDLL		= zip.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+ZPWDLL		= zpw.$(MOZ_BITS)$(VERSION_NUMBER)(DLL_SUFFIX)
+else
+AWTDLL		= libawt.$(DLL_SUFFIX)
+AWTSDLL		= libawt$(STAND_ALONE_JAVA_DLL_SUFFIX).$(DLL_SUFFIX)
+CONDLL		= libcon.$(DLL_SUFFIX)
+JBNDLL		= libjbn.$(DLL_SUFFIX)
+JDBCDLL		= libjdb.$(DLL_SUFFIX)
+JITDLL		= libjit.$(DLL_SUFFIX)
+JPWDLL		= libjpw.$(DLL_SUFFIX)
+JRTDLL		= libjrt.$(DLL_SUFFIX)
+JSJDLL		= libjsj.$(DLL_SUFFIX)
+MMDLL		= libmm.$(DLL_SUFFIX)
+NETDLL		= libnet.$(DLL_SUFFIX)
+NSCDLL		= libnsc.$(DLL_SUFFIX)
+ZIPDLL		= libzip.$(DLL_SUFFIX)
+ZPWDLL		= libzpw.$(DLL_SUFFIX)
+endif
+
+JAVA_DEFINES	+= -DAWTSDLL=\"$(AWTSDLL)\" -DCONDLL=\"$(CONDLL)\" -DJBNDLL=\"$(JBNDLL)\" -DJDBDLL=\"$(JDBDLL)\" \
+		   -DJSJDLL=\"$(JSJDLL)\" -DNETDLL=\"$(NETDLL)\" -DNSCDLL=\"$(NSCDLL)\" -DZPWDLL=\"$(ZPWDLL)\" \
+                   -DJAR_NAME=\"$(JAR_NAME)\"
+
+ifeq ($(AWT_11),1)
+JAVA_DEFINES    += -DAWT_11
+else
+JAVA_DEFINES    += -DAWT_102
+endif
+

mozilla/modules/libpr0n/Makefile.in

@@ -1,33 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src decoders
-
-include $(topsrcdir)/config/rules.mk
-
-

mozilla/modules/libpr0n/decoders/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= ppm png gif jpeg
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/gif/GIF2.h

@@ -1,323 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is Netscape Communications
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef _GIF_H_
-#define _GIF_H_
-
-/* gif2.h  
-   The interface for the GIF87/89a decoder. 
-*/
-// List of possible parsing states
-typedef enum {
-    gif_gather,
-    gif_init,                   //1
-    gif_type,
-    gif_version,
-    gif_global_header,
-    gif_global_colormap,
-    gif_image_start,            //6
-    gif_image_header,
-    gif_image_colormap,
-    gif_image_body,
-    gif_lzw_start,
-    gif_lzw,                    //11
-    gif_sub_block,
-    gif_extension,
-    gif_control_extension,
-    gif_consume_block,
-    gif_skip_block,
-    gif_done,                   //17
-    gif_oom,
-    gif_error,
-    gif_comment_extension,
-    gif_application_extension,
-    gif_netscape_extension_block,
-    gif_consume_netscape_extension,
-    gif_consume_comment,
-    gif_delay,
-    gif_wait_for_buffer_full,
-    gif_stop_animating   //added for animation stop 
-} gstate;
-
-/* "Disposal" method indicates how the image should be handled in the
-   framebuffer before the subsequent image is displayed. */
-typedef enum 
-{
-    DISPOSE_NOT_SPECIFIED      = 0,
-    DISPOSE_KEEP               = 1, /* Leave it in the framebuffer */
-    DISPOSE_OVERWRITE_BGCOLOR  = 2, /* Overwrite with background color */
-    DISPOSE_OVERWRITE_PREVIOUS = 4  /* Save-under */
-} gdispose;
-
-/* A RGB triplet representing a single pixel in the image's colormap
-   (if present.) */
-typedef struct _GIF_RGB
-{
-  PRUint8 red, green, blue, pad; /* Windows requires the fourth byte &
-                                    many compilers pad it anyway. */
-                    
-  /* XXX: hist_count appears to be unused */                                  
-  //PRUint16 hist_count;           /* Histogram frequency count. */
-} GIF_RGB;
-    
-/* Colormap information. */
-typedef struct _GIF_ColorMap {
-    int32 num_colors;           /* Number of colors in the colormap.
-                                   A negative value can be used to denote a
-                                   possibly non-unique set. */
-    GIF_RGB *map;                /* Colormap colors. */
-    PRUint8 *index;             /* NULL, if map is in index order.  Otherwise
-                                   specifies the indices of the map entries. */
-    void *table;                /* Lookup table for this colormap.  Private to
-                                   the Image Library. */
-} GIF_ColorMap;
-    
-/* An indexed RGB triplet. */
-typedef struct _GIF_IRGB {
-    PRUint8 index;
-    PRUint8 red, green, blue;
-} GIF_IRGB;
-
-/* A GIF decoder's state */
-typedef struct gif_struct {
-    void* clientptr;
-    /* Callbacks for this decoder instance*/
-    int (PR_CALLBACK *GIFCallback_NewPixmap)();
-    int (PR_CALLBACK *GIFCallback_BeginGIF)(
-      void*    aClientData,
-      PRUint32 aLogicalScreenWidth, 
-      PRUint32 aLogicalScreenHeight,
-      PRUint8  aLogicalScreenBackgroundRGBIndex);
-      
-    int (PR_CALLBACK* GIFCallback_EndGIF)(
-      void*    aClientData,
-      int      aAnimationLoopCount);
-      
-    int (PR_CALLBACK* GIFCallback_BeginImageFrame)(
-      void*    aClientData,
-      PRUint32 aFrameNumber,   /* Frame number, 1-n */
-      PRUint32 aFrameXOffset,  /* X offset in logical screen */
-      PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-      PRUint32 aFrameWidth,    
-      PRUint32 aFrameHeight,   
-      GIF_RGB* aTransparencyChromaKey);
-    int (PR_CALLBACK* GIFCallback_EndImageFrame)(
-      void* aClientData,
-      PRUint32 aFrameNumber,
-      PRUint32 aDelayTimeout);
-    int (PR_CALLBACK* GIFCallback_SetupColorspaceConverter)();
-    int (PR_CALLBACK* GIFCallback_ResetPalette)(); 
-    int (PR_CALLBACK* GIFCallback_InitTransparentPixel)();
-    int (PR_CALLBACK* GIFCallback_DestroyTransparentPixel)();
-    int (PR_CALLBACK* GIFCallback_HaveDecodedRow)(
-      void* aClientData,
-      PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
-      PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
-      int aXOffset,          /* With respect to GIF logical screen origin */
-      int aLength,           /* Length of the row? */
-      int aRow,              /* Row number? */
-      int aDuplicateCount,   /* Number of times to duplicate the row? */
-      PRUint8 aDrawMode,     /* il_draw_mode */
-      int aInterlacePass);
-    int (PR_CALLBACK *GIFCallback_HaveImageAll)(
-      void* aClientData);
-        
-    /* Parsing state machine */
-    gstate state;               /* Curent decoder master state */
-    PRUint8 *hold;                /* Accumulation buffer */
-    int32 hold_size;            /* Capacity, in bytes, of accumulation buffer */
-    PRUint8 *gather_head;         /* Next byte to read in accumulation buffer */
-    int32 gather_request_size;  /* Number of bytes to accumulate */
-    int32 gathered;             /* bytes accumulated so far*/
-    gstate post_gather_state;   /* State after requested bytes accumulated */
-    int32 requested_buffer_fullness; /* For netscape application extension */
-
-    /* LZW decoder state machine */
-    PRUint8 *stack;               /* Base of decoder stack */
-    PRUint8 *stackp;              /* Current stack pointer */
-    PRUint16 *prefix;
-    PRUint8 *suffix;
-    int datasize;
-    int codesize;
-    int codemask;
-    int clear_code;             /* Codeword used to trigger dictionary reset */
-    int avail;                  /* Index of next available slot in dictionary */
-    int oldcode;
-    PRUint8 firstchar;
-    int count;                  /* Remaining # bytes in sub-block */
-    int bits;                   /* Number of unread bits in "datum" */
-    int32 datum;                /* 32-bit input buffer */
-
-    /* Output state machine */
-    int ipass;                  /* Interlace pass; Ranges 1-4 if interlaced. */
-    PRUintn rows_remaining;        /* Rows remaining to be output */
-    PRUintn irow;                  /* Current output row, starting at zero */
-    PRUint8 *rgbrow;              /* Temporary storage for dithering/mapping */
-    PRUint8 *rowbuf;              /* Single scanline temporary buffer */
-    PRUint8 *rowend;              /* Pointer to end of rowbuf */
-    PRUint8 *rowp;                /* Current output pointer */
-
-    /* Parameters for image frame currently being decoded*/
-    PRUintn x_offset, y_offset;    /* With respect to "screen" origin */
-    PRUintn height, width;
-    PRUintn last_x_offset, last_y_offset; /* With respect to "screen" origin */
-    PRUintn last_height, last_width;
-    int interlaced;             /* TRUE, if scanlines arrive interlaced order */
-    int tpixel;                 /* Index of transparent pixel */
-    GIF_IRGB* transparent_pixel;
-    int is_transparent;         /* TRUE, if tpixel is valid */
-    int control_extension;      /* TRUE, if image control extension present */
-    int is_local_colormap_defined;
-    gdispose disposal_method;   /* Restore to background, leave in place, etc.*/
-    gdispose last_disposal_method;
-    GIF_RGB *local_colormap;     /* Per-image colormap */
-    int local_colormap_size;    /* Size of local colormap array. */
-    PRUint32 delay_time;        /* Display time, in milliseconds,
-                                   for this image in a multi-image GIF */
-
-    /* Global (multi-image) state */
-    int screen_bgcolor;         /* Logical screen background color */
-    int version;                /* Either 89 for GIF89 or 87 for GIF87 */
-    PRUintn screen_width;       /* Logical screen width & height */
-    PRUintn screen_height;
-    GIF_RGB *global_colormap;    /* Default colormap if local not supplied  */
-    int global_colormap_size;   /* Size of global colormap array. */
-    int images_decoded;         /* Counts images for multi-part GIFs */
-    int destroy_pending;        /* Stream has ended */
-    int progressive_display;    /* If TRUE, do Haeberli interlace hack */
-    int loop_count;             /* Netscape specific extension block to control
-                                   the number of animation loops a GIF renders. */
-} gif_struct;
-
-
-/* Create a new gif_struct */
-extern PRBool gif_create(gif_struct **gs);
-
-/* These are the APIs that the client calls to intialize,
-push data to, and shut down the GIF decoder. */
-PRBool GIFInit(
-  gif_struct* gs,
-
-  void* aClientData,
-  
-  int (*PR_CALLBACK GIFCallback_NewPixmap)(),
-  
-  int (*PR_CALLBACK GIFCallback_BeginGIF)(
-    void* aClientData,
-    PRUint32 aLogicalScreenWidth, 
-    PRUint32 aLogicalScreenHeight,
-    PRUint8  aBackgroundRGBIndex),
-    
-  int (*PR_CALLBACK GIFCallback_EndGIF)(
-    void*    aClientData,
-    int      aAnimationLoopCount),
-  
-  int (*PR_CALLBACK GIFCallback_BeginImageFrame)(
-    void*    aClientData,
-    PRUint32 aFrameNumber,   /* Frame number, 1-n */
-    PRUint32 aFrameXOffset,  /* X offset in logical screen */
-    PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-    PRUint32 aFrameWidth,    
-    PRUint32 aFrameHeight,   
-    GIF_RGB* aTransparencyChromaKey),
-  
-  int (*PR_CALLBACK GIFCallback_EndImageFrame)(
-    void* aClientData,
-    PRUint32 aFrameNumber,
-    PRUint32 aDelayTimeout),
-  
-  int (*PR_CALLBACK GIFCallback_SetupColorspaceConverter)(),
-  
-  int (*PR_CALLBACK GIFCallback_ResetPalette)(),
-  
-  int (*PR_CALLBACK GIFCallback_InitTransparentPixel)(),
-  
-  int (*PR_CALLBACK GIFCallback_DestroyTransparentPixel)(),
-  
-  int (*PR_CALLBACK GIFCallback_HaveDecodedRow)(
-    void* aClientData,
-    PRUint8* aRowBufPtr,   /* Pointer to single scanline temporary buffer */
-    PRUint8* aRGBrowBufPtr,/* Pointer to temporary storage for dithering/mapping */
-    int aXOffset,          /* With respect to GIF logical screen origin */
-    int aLength,           /* Length of the row? */
-    int aRow,              /* Row number? */
-    int aDuplicateCount,   /* Number of times to duplicate the row? */
-    PRUint8 aDrawMode,     /* il_draw_mode */
-    int aInterlacePass),
-    
-  int (*PR_CALLBACK GIFCallback_HaveImageAll)(
-    void* aClientData)
-  );
-
-extern void gif_destroy(gif_struct* aGIFStruct);
-
-int gif_write(gif_struct* aGIFStruct, const PRUint8 * buf, PRUint32 numbytes);
-
-PRUint8 gif_write_ready(gif_struct* aGIFStruct);
-
-extern void gif_complete(gif_struct** aGIFStruct);
-extern void gif_delay_time_callback(/* void *closure */);
-
-
-/* Callback functions that the client must implement and pass in 
-pointers for during the GIFInit call. These will be called back
-when the decoder has a decoded rows, frame size information, etc.*/
-
-/* GIFCallback_LogicalScreenSize is called only once to notify the client
-of the logical screen size, which will be the size of the total image. */
-typedef int (*PR_CALLBACK BEGINGIF_CALLBACK)(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aLogicalScreenBackgroundRGBIndex);
-                            
-typedef int (PR_CALLBACK *GIFCallback_EndGIF)(
-  void*    aClientData,
-  int      aAnimationLoopCount);
-
-/* GIFCallback_BeginImageFrame is called at the beginning of each frame of
-a GIF.*/
-typedef int (PR_CALLBACK *GIFCallback_BeginImageFrame)(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFraqeYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight); 
-
-extern int GIFCallback_EndImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout); /* Time in milliseconds this frame should be displayed before the next frame.
-                              This information appears in a sub control block, so we don't
-                              transmit it back to the client until we're done with the frame. */
-
-/*
-extern int GIFCallback_SetupColorspaceConverter();
-extern int GIFCallback_ResetPalette(); 
-extern int GIFCallback_InitTransparentPixel();
-extern int GIFCallback_DestroyTransparentPixel();
-*/
-extern int GIFCallback_HaveDecodedRow();
-extern int GIFCallback_HaveImageAll();
-
-#endif
-

mozilla/modules/libpr0n/decoders/gif/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imggif
-LIBRARY_NAME	= imggif
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom necko layout gfx2 imglib2
-
-CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
-
-EXTRA_DSO_LDOPTS = $(GIF_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/gif/makefile.win

@@ -1,52 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imggif
-LIBRARY_NAME	= imggif
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsGIFDecoder2.obj \
-		.\$(OBJDIR)\GIF2.obj \
-		.\$(OBJDIR)\nsGIFModule.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp

@@ -1,506 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s): 
- *  Chris Saari <saari@netscape.com>
- */
-
-#include "nsGIFDecoder2.h"
-#include "nsIInputStream.h"
-#include "nsIComponentManager.h"
-#include "nsIImage.h"
-#include "nsMemory.h"
-
-#include "imgIContainerObserver.h"
-
-#include "nsRect.h"
-
-//////////////////////////////////////////////////////////////////////
-// GIF Decoder Implementation
-// This is an adaptor between GIF2 and imgIDecoder
-
-NS_IMPL_ISUPPORTS2(nsGIFDecoder2, imgIDecoder, nsIOutputStream);
-
-nsGIFDecoder2::nsGIFDecoder2()
-{
-  NS_INIT_ISUPPORTS();
-  mImageFrame = nsnull;
-  
-  mGIFStruct = nsnull;
-
-  mAlphaLine = nsnull;
-}
-
-nsGIFDecoder2::~nsGIFDecoder2(void)
-{
-  if (mAlphaLine)
-    nsMemory::Free(mAlphaLine);
-
-  if (mGIFStruct) {
-    gif_destroy(mGIFStruct);
-    mGIFStruct = nsnull;
-  }
-}
-
-//******************************************************************************
-/** imgIDecoder methods **/
-//******************************************************************************
-
-//******************************************************************************
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsGIFDecoder2::Init(imgIRequest *aRequest)
-{
-  mImageRequest = aRequest;
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImageContainer));
-
-  /* do gif init stuff */
-  /* Always decode to 24 bit pixdepth */
-  
-  PRBool created = gif_create(&mGIFStruct);
-
-  NS_ASSERTION(created, "gif_create failed");
-
-  // Call GIF decoder init routine
-  GIFInit(
-    mGIFStruct,
-    this,
-    NewPixmap,
-    BeginGIF,
-    EndGIF,
-    BeginImageFrame,
-    EndImageFrame,
-    SetupColorspaceConverter,
-    ResetPalette,
-    InitTransparentPixel,
-    DestroyTransparentPixel,
-    HaveDecodedRow,
-    HaveImageAll);
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsGIFDecoder2::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mImageRequest;
-  NS_IF_ADDREF(*aRequest);
-      
-  return NS_OK;
-}
-
-
-//******************************************************************************
-/** nsIOutputStream methods **/
-//******************************************************************************
-
-//******************************************************************************
-/* void close (); */
-NS_IMETHODIMP nsGIFDecoder2::Close()
-{
-  if (mGIFStruct) {
-    gif_destroy(mGIFStruct);
-    mGIFStruct = nsnull;
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void flush (); */
-NS_IMETHODIMP nsGIFDecoder2::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* static callback from nsIInputStream::ReadSegments */
-static NS_METHOD ReadDataOut(nsIInputStream* in,
-                             void* closure,
-                             const char* fromRawSegment,
-                             PRUint32 toOffset,
-                             PRUint32 count,
-                             PRUint32 *writeCount)
-{
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, closure);
-  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
-  return NS_OK;
-}
-
-//******************************************************************************
-PRUint32 nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count)
-{
-  // Push the data to the GIF decoder
-  
-  // First we ask if the gif decoder is ready for more data, and if so, push it.
-  // In the new decoder, we should always be able to process more data since
-  // we don't wait to decode each frame in an animation now.
-  if(gif_write_ready(mGIFStruct)) {
-    gif_write(mGIFStruct, data, count);
-  }
-    
-
-  return count; // we always consume all the data
-}
-
-//******************************************************************************
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  inStr->ReadSegments(
-    ReadDataOut, // Callback
-    this,     
-    count, 
-    _retval);
-
-    // if error
-    //mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
-  return NS_OK;
-}
-
-//******************************************************************************
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsGIFDecoder2::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsGIFDecoder2::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-//******************************************************************************
-NS_IMETHODIMP nsGIFDecoder2::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsGIFDecoder2::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-NS_IMETHODIMP nsGIFDecoder2::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-//******************************************************************************
-// GIF decoder callback methods. Part of pulic API for GIF2
-//******************************************************************************
-
-//******************************************************************************
-int BeginGIF(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aBackgroundRGBIndex)
-{
-  // copy GIF info into imagelib structs
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartDecode(nsnull, nsnull);
-
-  decoder->mImageContainer->Init(aLogicalScreenWidth, aLogicalScreenHeight, decoder->mObserver);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImageContainer);
-
-  return 0;
-}
-
-//******************************************************************************
-int EndGIF(
-    void*    aClientData,
-    int      aAnimationLoopCount)
-{
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  if (decoder->mObserver) {
-    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImageContainer);
-    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  decoder->mImageContainer->SetLoopCount(aAnimationLoopCount);
-  decoder->mImageContainer->DecodingComplete();
-  return 0;
-}
-
-//******************************************************************************
-int BeginImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight,   
-  GIF_RGB* aTransparencyChromaKey) /* don't have this info yet */
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  
-  decoder->mImageFrame = nsnull; // clear out our current frame reference
-  decoder->mGIFStruct->x_offset = aFrameXOffset;
-  decoder->mGIFStruct->y_offset = aFrameYOffset;
-  decoder->mGIFStruct->width = aFrameWidth;
-  decoder->mGIFStruct->height = aFrameHeight;
-
-  return 0;
-}
-
-//******************************************************************************
-int EndImageFrame(
-  void*    aClientData, 
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout)  /* Time this frame should be displayed before the next frame 
-                              we can't have this in the image frame init because it doesn't
-                              show up in the GIF frame header, it shows up in a sub control
-                              block.*/
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  
-  // We actually have the timeout information before we get the lzw encoded image
-  // data, at least according to the spec, but we delay in setting the timeout for
-  // the image until here to help ensure that we have the whole image frame decoded before
-  // we go off and try to display another frame.
-
-// XXXXXXXX
-  // decoder->mImageFrame->SetTimeout(aDelayTimeout);
-  decoder->mImageContainer->EndFrameDecode(aFrameNumber, aDelayTimeout);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mImageFrame);
-
-  decoder->mImageFrame = nsnull;
-  return 0;
-}
-  
-
-
-//******************************************************************************
-// GIF decoder callback
-int HaveImageAll(
-  void* aClientData)
-{
-  return 0;
-}
-
-//******************************************************************************
-// GIF decoder callback notification that it has decoded a row
-int HaveDecodedRow(
-  void* aClientData,
-  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
-  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
-  int aXOffset,          // With respect to GIF logical screen origin
-  int aLength,           // Length of the row?
-  int aRowNumber,        // Row number?
-  int aDuplicateCount,   // Number of times to duplicate the row?
-  PRUint8 aDrawMode,     // il_draw_mode
-  int aInterlacePass)    // interlace pass (1-4)
-{
-  nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
-  PRUint32 bpr, abpr;
-  // We have to delay allocation of the image frame until now because
-  // we won't have control block info (transparency) until now. The conrol
-  // block of a GIF stream shows up after the image header since transparency
-  // is added in GIF89a and control blocks are how the extensions are done.
-  // How annoying.
-  if(! decoder->mImageFrame) {
-    gfx_format format = gfxIFormats::RGB;
-    if (decoder->mGIFStruct->is_transparent)
-      format = gfxIFormats::RGB_A1;
-
-#ifdef XP_PC
-    // XXX this works...
-    format += 1; // RGB to BGR
-#endif
-
-    // initalize the frame and append it to the container
-    decoder->mImageFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-    decoder->mImageFrame->Init(
-      decoder->mGIFStruct->x_offset, decoder->mGIFStruct->y_offset, 
-      decoder->mGIFStruct->width, decoder->mGIFStruct->height, format);
-      
-    decoder->mImageContainer->AppendFrame(decoder->mImageFrame);
-
-    if (decoder->mObserver)
-      decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mImageFrame);
-
-    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
-    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
-
-    if (format == gfxIFormats::RGB_A1 || format == gfxIFormats::BGR_A1) {
-      if (decoder->mAlphaLine)
-        nsMemory::Free(decoder->mAlphaLine);
-      decoder->mAlphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
-    }
-  } else {
-    decoder->mImageFrame->GetImageBytesPerRow(&bpr);
-    decoder->mImageFrame->GetAlphaBytesPerRow(&abpr);
-  }
-  
-  if (aRowBufPtr) {
-    nscoord width;
-
-    decoder->mImageFrame->GetWidth(&width);
-    PRUint32 iwidth = width;
-
-    gfx_format format;
-    decoder->mImageFrame->GetFormat(&format);
-
-    // XXX map the data into colors
-    int cmapsize;
-    GIF_RGB* cmap;
-    if(decoder->mGIFStruct->local_colormap) {
-      cmapsize = decoder->mGIFStruct->local_colormap_size;
-      cmap = decoder->mGIFStruct->local_colormap;
-    } else {
-      cmapsize = decoder->mGIFStruct->global_colormap_size;
-      cmap = decoder->mGIFStruct->global_colormap;
-    }
-
-    PRUint8* rgbRowIndex = aRGBrowBufPtr;
-    PRUint8* rowBufIndex = aRowBufPtr;
-        
-    switch (format) {
-    case gfxIFormats::RGB:
-      {
-        while(rowBufIndex != decoder->mGIFStruct->rowend) {
-#ifdef XP_MAC
-          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
-#endif
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-          ++rowBufIndex;
-        }
-
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-      }
-      break;
-    case gfxIFormats::BGR:
-      {
-        while(rowBufIndex != decoder->mGIFStruct->rowend) {
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-          *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-          ++rowBufIndex;
-        }
-
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-      }
-      break;
-    case gfxIFormats::RGB_A1:
-    case gfxIFormats::BGR_A1:
-      {
-        memset(aRGBrowBufPtr, 0, bpr);
-        memset(decoder->mAlphaLine, 0, abpr);
-        PRUint32 iwidth = (PRUint32)width;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          if (*rowBufIndex != decoder->mGIFStruct->tpixel) {
-#ifdef XP_PC
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-#else
-#ifdef XP_MAC
-          *rgbRowIndex++ = 0; // Mac is always 32bits per pixel, this is pad
-#endif
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].red;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].green;
-            *rgbRowIndex++ = cmap[PRUint8(*rowBufIndex)].blue;
-#endif
-            decoder->mAlphaLine[x>>3] |= 1<<(7-x&0x7);
-          } else {
-#ifdef XP_MAC
-            rgbRowIndex+=4;
-#else
-            rgbRowIndex+=3;
-#endif
-          }
-
-          ++rowBufIndex;
-        }
-        decoder->mImageFrame->SetImageData((PRUint8*)aRGBrowBufPtr, bpr, aRowNumber*bpr);
-        decoder->mImageFrame->SetAlphaData(decoder->mAlphaLine, abpr, aRowNumber*abpr);
-      }
-      break;
-    default:
-      break;
-
-    }
-
-    nsRect r(0, aRowNumber, width, 1);
-
-    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mImageFrame, &r);
-  }
-
-  return 0;
-}
-
-//******************************************************************************
-int ResetPalette()
-{
-  return 0;
-}
-
-//******************************************************************************
-int SetupColorspaceConverter()
-{
-  return 0;
-}
-
-//******************************************************************************
-int EndImageFrame()
-{
-  return 0;
-}
-
-//******************************************************************************
-int NewPixmap()
-{
-  return 0;
-}
-
-//******************************************************************************
-int InitTransparentPixel()
-{
-  return 0;
-}
-
-//******************************************************************************
-int DestroyTransparentPixel()
-{
-  return 0;
-}

mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.h

@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s): 
- *  Chris Saari <saari@netscape.com>
- */
-
-#ifndef _nsGIFDecoder2_h
-#define _nsGIFDecoder2_h
-
-#include "nsCOMPtr.h"
-#include "imgIDecoder.h"
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#include "GIF2.h"
-
-#define NS_GIFDECODER2_CID \
-{ /* 797bec5a-1dd2-11b2-a7f8-ca397e0179c4 */         \
-     0x797bec5a,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xa7, 0xf8, 0xca, 0x39, 0x7e, 0x01, 0x79, 0xc4} \
-}
-
-//////////////////////////////////////////////////////////////////////
-// nsGIFDecoder2 Definition
-
-class nsGIFDecoder2 : public imgIDecoder   
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsGIFDecoder2();
-  virtual ~nsGIFDecoder2();
-
-  static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-  
-  NS_METHOD ProcessData(unsigned char *data, PRUint32 count);
-  
-  nsCOMPtr<imgIContainer> mImageContainer;
-  nsCOMPtr<gfxIImageFrame> mImageFrame;
-  nsCOMPtr<imgIRequest> mImageRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-  
-  gif_struct *mGIFStruct;
-  
-  PRUint8 *mAlphaLine;
-};
-
-// static callbacks for the GIF decoder
-static int PR_CALLBACK BeginGIF(
-  void*    aClientData,
-  PRUint32 aLogicalScreenWidth, 
-  PRUint32 aLogicalScreenHeight,
-  PRUint8  aBackgroundRGBIndex);
-  
-static int PR_CALLBACK HaveDecodedRow(
-  void* aClientData,
-  PRUint8* aRowBufPtr,   // Pointer to single scanline temporary buffer
-  PRUint8* aRGBrowBufPtr,// Pointer to temporary storage for dithering/mapping
-  int aXOffset,          // With respect to GIF logical screen origin
-  int aLength,           // Length of the row?
-  int aRow,              // Row number?
-  int aDuplicateCount,   // Number of times to duplicate the row?
-  PRUint8 aDrawMode,     // il_draw_mode
-  int aInterlacePass);
-    
-static int PR_CALLBACK NewPixmap();
-
-static int PR_CALLBACK EndGIF(
-  void*    aClientData,
-  int      aAnimationLoopCount);
-  
-static int PR_CALLBACK BeginImageFrame(
-  void*    aClientData,
-  PRUint32 aFrameNumber,   /* Frame number, 1-n */
-  PRUint32 aFrameXOffset,  /* X offset in logical screen */
-  PRUint32 aFrameYOffset,  /* Y offset in logical screen */
-  PRUint32 aFrameWidth,    
-  PRUint32 aFrameHeight,   
-  GIF_RGB* aTransparencyChromaKey);
-static int PR_CALLBACK EndImageFrame(
-  void*    aClientData, 
-  PRUint32 aFrameNumber,
-  PRUint32 aDelayTimeout);
-static int PR_CALLBACK SetupColorspaceConverter();
-static int PR_CALLBACK ResetPalette();
-static int PR_CALLBACK InitTransparentPixel();
-static int PR_CALLBACK DestroyTransparentPixel();
-
-static int PR_CALLBACK HaveImageAll(
-  void* aClientData);
-#endif

mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp

@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Chris Saari <saari@netscape.com>
- */
-
-#include "nsGIFDecoder2.h"
-#include "nsIComponentManager.h"
-#include "nsIGenericFactory.h"
-#include "nsISupports.h"
-#include "nsCOMPtr.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIFDecoder2)
-
-static nsModuleComponentInfo components[] =
-{
-  { "GIF Decoder",
-     NS_GIFDECODER2_CID,
-     "@mozilla.org/image/decoder;2?type=image/gif",
-     nsGIFDecoder2Constructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsGIFModule2", components)
-

mozilla/modules/libpr0n/decoders/gif/win32.order

@@ -1,18 +0,0 @@
-?AddRef@nsGIFDecoder2@@UAGKXZ ; 2550
-?Release@nsGIFDecoder2@@UAGKXZ ; 2550
-?gif_write_ready@@YAEPAUgif_struct@@@Z ; 1624
-?ProcessData@nsGIFDecoder2@@QAGIPAEI@Z ; 1624
-?gif_write@@YAHPAUgif_struct@@PBEI@Z ; 1624
-?WriteFrom@nsGIFDecoder2@@UAGIPAVnsIInputStream@@IPAI@Z ; 1309
-?Close@nsGIFDecoder2@@UAGIXZ ; 1275
-??_GnsGIFDecoder2@@UAEPAXI@Z ; 1275
-??0nsGIFDecoder2@@QAE@XZ ; 1275
-??1nsGIFDecoder2@@UAE@XZ ; 1275
-?QueryInterface@nsGIFDecoder2@@UAGIABUnsID@@PAPAX@Z ; 1275
-?GIFInit@@YAHPAUgif_struct@@PAXP6AHXZP6AH1IIE@ZP6AH1H@ZP6AH1IIIIIPAU_GIF_RGB@@@ZP6AH1II@Z2222P6AH1PAE8HHHHEH@ZP6AH1@Z@Z ; 1275
-?Init@nsGIFDecoder2@@UAGIPAVimgIRequest@@@Z ; 1275
-?Flush@nsGIFDecoder2@@UAGIXZ ; 1275
-?gif_destroy@@YAXPAUgif_struct@@@Z ; 1275
-?gif_create@@YAHPAPAUgif_struct@@@Z ; 1275
-?il_BACat@@YAPADPAPADIPBDI@Z ; 698
-_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.cpp

@@ -1,378 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-
-#include "nsIconChannel.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsMimeTypes.h"
-#include "nsMemory.h"
-#include "nsIStringStream.h"
-#include "nsIURL.h"
-#include "nsNetUtil.h"
-#include "nsIMimeService.h"
-#include "nsCExternalHandlerService.h"
-#include "plstr.h"
-
-#include <Files.h>
-#include <QuickDraw.h>
-
-// nsIconChannel methods
-nsIconChannel::nsIconChannel()
-{
-  NS_INIT_REFCNT();
-  mStatus = NS_OK;
-}
-
-nsIconChannel::~nsIconChannel() 
-{}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
-                              nsIChannel, 
-                              nsIRequest)
-
-nsresult nsIconChannel::Init(nsIURI* uri)
-{
-  nsresult rv;
-  NS_ASSERTION(uri, "no uri");
-  mUrl = uri;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
-{
-  NS_NOTREACHED("nsIconChannel::IsPending");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
-{
-  *status = mStatus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
-{
-  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-  nsresult rv = NS_ERROR_FAILURE;
-
-  mStatus = status;
-  return rv;
-}
-
-NS_IMETHODIMP nsIconChannel::Suspend(void)
-{
-  NS_NOTREACHED("nsIconChannel::Suspend");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::Resume(void)
-{
-  NS_NOTREACHED("nsIconChannel::Resume");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
-{
-  *aURI = mOriginalURI ? mOriginalURI : mUrl;
-  NS_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
-{
-  mOriginalURI = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
-{
-  *aURI = mUrl;
-  NS_IF_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
-{
-  mUrl = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-  // get the file name from the url
-  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
-  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
-  mUrl->GetHost(getter_Copies(fileName));
-  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
-  if (url)
-    url->GetFileBaseName(getter_Copies(filePath));
-  nsresult rv = NS_OK;  
-  nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID, &rv));
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  // extract the extension out of the dummy file so we can look it up in the mime service.
-  char * chFileName = fileName.get(); // get the underlying buffer
-  char * fileExtension = PL_strrchr(chFileName, '.');
-  if (!fileExtension) return NS_ERROR_FAILURE; // no file extension to work from.
-  
-  // look the file extension up in the registry.
-  nsCOMPtr<nsIMIMEInfo> mimeInfo;
-  mimeService->GetFromExtension(fileExtension, getter_AddRefs(mimeInfo));
-  NS_ENSURE_TRUE(mimeInfo, NS_ERROR_FAILURE);
-  
-  // get the mac creator and file type for this mime object
-  PRUint32 macType;
-  PRUint32 macCreator;
-  
-  mimeInfo->GetMacType(&macType);
-  mimeInfo->GetMacCreator(&macCreator);
-  
-  // get a refernce to the desktop database  
-  DTPBRec 	pb;
-  OSErr err = noErr;
-  
-  memset(&pb, 0, sizeof(DTPBRec));
-  pb.ioCompletion = nil;
-  pb.ioVRefNum = 0; // default desktop volume
-  pb.ioNamePtr = nil;
-  err = PBDTGetPath(&pb);
-  if (err != noErr) return NS_ERROR_FAILURE;
-  
-  pb.ioFileCreator = macCreator;
-  pb.ioFileType = macType;
-  pb.ioCompletion = nil;
-  pb.ioTagInfo = 0;
-  
-  PRUint32 numPixelsInRow = 0;
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-  {
-    pb.ioDTReqCount = kLarge8BitIconSize;
-    pb.ioIconType = kLarge8BitIcon;
-    numPixelsInRow = 32;
-  }
-  else
-  {
-    pb.ioDTReqCount = kSmall8BitIconSize;
-    pb.ioIconType = kSmall8BitIcon;  
-    numPixelsInRow = 16;
-  }
-  
-  // allocate a buffer large enough to handle the icon
-  PRUint8 * bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
-  pb.ioDTBuffer = (Ptr) bitmapData;
-  
-  err = PBDTGetIcon(&pb, false);
-  if (err != noErr) return NS_ERROR_FAILURE; // unable to fetch the icon....
-  
-  nsCString iconBuffer;
-  iconBuffer.Assign((char) numPixelsInRow);
-  iconBuffer.Append((char) numPixelsInRow);
-  CTabHandle cTabHandle = GetCTable(72);
-  if (!cTabHandle) return NS_ERROR_FAILURE;
-  
-  HLock((Handle) cTabHandle);
-  CTabPtr colTable = *cTabHandle;
-  RGBColor rgbCol;
-  PRUint8 redValue, greenValue, blueValue;
-  
-  for (PRUint32 index = 0; index < pb.ioDTReqCount; index ++)
-  {
-
-  	// each byte in bitmapData needs to be converted from an 8 bit system color into 
-    // 24 bit RGB data which our special icon image decoder can understand.
-    ColorSpec colSpec =  colTable->ctTable[ bitmapData[index]];
-    rgbCol = colSpec.rgb;
-    
-    redValue = rgbCol.red & 0xff;
-    greenValue = rgbCol.green & 0xff;
-    blueValue = rgbCol.blue & 0xff;
-    
-    // for some reason the image code on the mac expects each RGB pixel value to be padded with a preceding byte.
-    // so add the padding here....
-    iconBuffer.Append((char) 0);
-    iconBuffer.Append((char) redValue);
-    iconBuffer.Append((char) greenValue);
-    iconBuffer.Append((char) blueValue);
-  }
-  
-  
-  HUnlock((Handle) cTabHandle);
-  DisposeCTable(cTabHandle);
-  nsMemory::Free(bitmapData);
-  
-  // now that the color bitmask is taken care of, we need to do the same thing again for the transparency
-  // bit mask....
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-  {
-    pb.ioDTReqCount = kLargeIconSize;
-    pb.ioIconType = kLargeIcon;
-  }
-  else
-  {
-    pb.ioDTReqCount = kSmallIconSize;
-    pb.ioIconType = kSmallIcon; 
-  }
-  
-  // allocate a buffer large enough to handle the icon
-  bitmapData = (PRUint8 *) nsMemory::Alloc (pb.ioDTReqCount);
-  pb.ioDTBuffer = (Ptr) bitmapData;
-  err = PBDTGetIcon(&pb, false);
-  PRUint32 index = pb.ioDTReqCount/2;
-  while (index < pb.ioDTReqCount)
-  {
-   iconBuffer.Append((char) bitmapData[index]);
-   iconBuffer.Append((char) bitmapData[index + 1]);
-   if (numPixelsInRow == 32)
-   {
-     iconBuffer.Append((char) bitmapData[index + 2]);
-     iconBuffer.Append((char) bitmapData[index + 3]);
-     index += 4;
-   }
-   else
-   {
-    iconBuffer.Append((char) 255); // 2 bytes of padding
-    iconBuffer.Append((char) 255);
-    index += 2;
-   }
-  }
-  
-  nsMemory::Free(bitmapData);
-  
-  // turn our nsString into a stream looking object...
-  aListener->OnStartRequest(this, ctxt);
-
- // turn our string into a stream...
- nsCOMPtr<nsISupports> streamSupports;
- NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
-
- nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
- aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
- aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-  mLoadAttributes = aLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
-{
-  if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-  *aContentType = nsCRT::strdup("image/icon");
-  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::SetContentType(const char *aContentType)
-{
-  //It doesn't make sense to set the content-type on this type
-  // of channel...
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
-{
-  *aContentLength = mContentLength;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
-{
-  NS_NOTREACHED("nsIconChannel::SetContentLength");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-  mLoadGroup = aLoadGroup;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
-{
-  *aOwner = mOwner.get();
-  NS_IF_ADDREF(*aOwner);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
-{
-  mOwner = aOwner;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-  *aNotificationCallbacks = mCallbacks.get();
-  NS_IF_ADDREF(*aNotificationCallbacks);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-  mCallbacks = aNotificationCallbacks;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-  *aSecurityInfo = nsnull;
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/decoders/icon/mac/nsIconChannel.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIURI.h"
-
-class nsIconChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUEST
-  NS_DECL_NSICHANNEL
-
-  nsIconChannel();
-  virtual ~nsIconChannel();
-
-  nsresult Init(nsIURI* uri);
-
-protected:
-  nsCOMPtr<nsIURI> mUrl;
-  nsCOMPtr<nsIURI> mOriginalURI;
-  PRUint32         mLoadAttributes;
-  PRInt32          mContentLength;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
-  nsCOMPtr<nsISupports>  mOwner; 
-  nsresult mStatus;
-};
-
-#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/icon/makefile.win

@@ -1,62 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#   Scott MacGregor <mscott@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIR=win
-
-MODULE			= imgicon
-LIBRARY_NAME	= imgicon
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsIconDecoder.obj \
-		.\$(OBJDIR)\nsIconModule.obj  \
-    .\$(OBJDIR)\nsIconProtocolHandler.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR)               \
-	$(DIST)\lib\xpcom.lib    \
-	$(DIST)\lib\gkgfxwin.lib \
-  $(DIST)\lib\imgiconwin_s.lib \
-	$(NULL)
-
-WIN_LIBS= shell32.lib
-
-INCS = $(INCS)                                         \
-        -I$(DEPTH)\dist\include                        \
-        -I$(DEPTH)\modules\libpr0n\decoders\icon\win   \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.cpp

@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- *
- */
-
-#include "nsIconDecoder.h"
-#include "nsIInputStream.h"
-#include "imgIContainer.h"
-#include "imgIContainerObserver.h"
-#include "nspr.h"
-#include "nsIComponentManager.h"
-#include "nsRect.h"
-
-NS_IMPL_THREADSAFE_ADDREF(nsIconDecoder);
-NS_IMPL_THREADSAFE_RELEASE(nsIconDecoder);
-
-NS_INTERFACE_MAP_BEGIN(nsIconDecoder)
-   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStream)
-   NS_INTERFACE_MAP_ENTRY(nsIOutputStream)
-   NS_INTERFACE_MAP_ENTRY(imgIDecoder)
-NS_INTERFACE_MAP_END_THREADSAFE
-
-nsIconDecoder::nsIconDecoder()
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsIconDecoder::~nsIconDecoder()
-{ }
-
-
-/** imgIDecoder methods **/
-
-NS_IMETHODIMP nsIconDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-  if (!mFrame) return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-/** nsIOutputStream methods **/
-
-NS_IMETHODIMP nsIconDecoder::Close()
-{
-  if (mObserver) 
-  {
-    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
-    mObserver->OnStopContainer(nsnull, nsnull, mImage);
-    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::Flush()
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  nsresult rv;
-
-  char *buf = (char *)PR_Malloc(count);
-  if (!buf) return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
- 
-  // read the data from the input stram...
-  PRUint32 readLen;
-  rv = inStr->Read(buf, count, &readLen);
-
-  char *data = buf;
-
-  if (NS_FAILED(rv)) return rv;
-
-  // since WriteFrom is only called once, go ahead and fire the on start notifications..
-
-  mObserver->OnStartDecode(nsnull, nsnull);
-  PRUint32 i = 0;
-  // Read size
-  PRInt32 w, h;
-  w = data[0];
-  h = data[1];
-
-  data += 2;
-
-  readLen -= i + 2;
-
-  mImage->Init(w, h, mObserver);
-  if (mObserver)
-    mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-  mFrame->Init(0, 0, w, h, gfxIFormats::RGB_A1);
-  mImage->AppendFrame(mFrame);
-  if (mObserver)
-    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-  
-  PRUint32 bpr, abpr;
-  nscoord width, height;
-  mFrame->GetImageBytesPerRow(&bpr);
-  mFrame->GetAlphaBytesPerRow(&abpr);
-  mFrame->GetWidth(&width);
-  mFrame->GetHeight(&height);
-  
-  i = 0;
-  PRInt32 rownum = 0;  // XXX this better not have a decimal
-  
-  PRInt32 wroteLen = 0;
-
-  do 
-  {
-    PRUint8 *line = (PRUint8*)data + i*bpr;
-    mFrame->SetImageData(line, bpr, (rownum++)*bpr);
-
-    nsRect r(0, rownum, width, 1);
-    mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-    wroteLen += bpr ;
-    i++;
-  } while(rownum < height);
-
-
- // now we want to send in the alpha data...
- for (rownum = 0; rownum < height; rownum ++)
- {
-  PRUint8 * line = (PRUint8*) data + abpr * rownum + height*bpr;
-  mFrame->SetAlphaData(line, abpr, (rownum)*abpr);   
- } 
-
-  PR_FREEIF(buf);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/modules/libpr0n/decoders/icon/nsIconDecoder.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconDecoder_h__
-#define nsIconDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#define NS_ICONDECODER_CID                           \
-{ /* FFC08380-256C-11d5-9905-001083010E9B */         \
-     0xffc08380,                                     \
-     0x256c,                                         \
-     0x11d5,                                         \
-    { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b }   \
-}
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-// The icon decoder is a decoder specifically tailored for loading icons 
-// from the OS. We've defined our own little format to represent these icons
-// and this decoder takes that format and converts it into 24-bit RGB with alpha channel
-// support. It was modeled a bit off the PPM decoder.
-//
-// Assumptions about the decoder:
-// (1) We receive ALL of the data from the icon channel in one OnDataAvailable call. We don't
-//     support multiple ODA calls yet.
-// (2) the format of the incoming data is as follows:
-//     The first two bytes contain the width and the height of the icon. 
-//     Followed by 3 bytes per pixel for the color bitmap row after row. (for heigh * width * 3 bytes)
-//     Followed by bit mask data (used for transparency on the alpha channel). 
-//
-//
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-class nsIconDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsIconDecoder();
-  virtual ~nsIconDecoder();
-
-private:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-};
-
-#endif // nsIconDecoder_h__

mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsIconDecoder.h"
-#include "nsIconProtocolHandler.h"
-
-// objects that just require generic constructors
-/******************************************************************************
- * Protocol CIDs
- */
-#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
-
-static nsModuleComponentInfo components[] =
-{
-  { "icon decoder",
-    NS_ICONDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/icon",
-    nsIconDecoderConstructor, },
-
-   { "Icon Protocol Handler",      
-      NS_ICONPROTOCOL_CID,
-      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "icon",
-      nsIconProtocolHandlerConstructor
-    }
-};
-
-NS_IMPL_NSGETMODULE("nsIconDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp

@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#include "nsIconChannel.h"
-#include "nsIconProtocolHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-static NS_DEFINE_CID(kStandardURICID, NS_STANDARDURL_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsIconProtocolHandler::nsIconProtocolHandler() 
-{
-  NS_INIT_REFCNT();
-}
-
-nsIconProtocolHandler::~nsIconProtocolHandler() 
-{}
-
-NS_IMPL_ISUPPORTS2(nsIconProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
-
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP nsIconProtocolHandler::GetScheme(char* *result) 
-{
-  *result = nsCRT::strdup("icon");
-  if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::GetDefaultPort(PRInt32 *result) 
-{
-  *result = 0;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI, nsIURI **result) 
-{
-  nsresult rv;
-
-  // no concept of a relative icon url
-  NS_ASSERTION(!aBaseURI, "base url passed into icon protocol handler");
-  nsCOMPtr<nsIURI> url = do_CreateInstance(kStandardURICID, &rv);
-  if (NS_FAILED(rv)) return rv;
-  rv = url->SetSpec((char*)aSpec);
-  *result = url;
-  NS_IF_ADDREF(*result);
-  return rv;
-}
-
-NS_IMETHODIMP nsIconProtocolHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-  nsCOMPtr<nsIChannel> channel;
-  NS_NEWXPCOM(channel, nsIconChannel);
-
-  if (channel)
-    NS_STATIC_CAST(nsIconChannel*,NS_STATIC_CAST(nsIChannel*, channel))->Init(url);
-
-  *result = channel;
-  NS_IF_ADDREF(*result);
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libpr0n/decoders/icon/nsIconProtocolHandler.h

@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconProtocolHandler_h___
-#define nsIconProtocolHandler_h___
-
-#include "nsWeakReference.h"
-#include "nsIProtocolHandler.h"
-
-class nsIconProtocolHandler : public nsIProtocolHandler, public nsSupportsWeakReference
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsIconProtocolHandler methods:
-    nsIconProtocolHandler();
-    virtual ~nsIconProtocolHandler();
-
-protected:
-};
-
-#endif /* nsIconProtocolHandler_h___ */

mozilla/modules/libpr0n/decoders/icon/win/makefile.win

@@ -1,46 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#  Scott MacGregor <mscott@netscape.com>
-
-DEPTH=..\..\..\..\..
-MODULE=imgicon
-
-LIBRARY_NAME=imgiconwin_s
-
-CPP_OBJS=\
-        .\$(OBJDIR)\nsIconChannel.obj  	\
-         $(NULL)
-
-INCS = $(INCS)                  \
-        -I$(DEPTH)\dist\include \
-        -I..\       	         	\
-		$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-         
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp

@@ -1,377 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *   Scott MacGregor <mscott@netscape.com>
- */
-
-
-#include "nsIconChannel.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsMimeTypes.h"
-#include "nsMemory.h"
-#include "nsIStringStream.h"
-#include "nsIURL.h"
-#include "nsNetUtil.h"
-
-// we need windows.h to read out registry information...
-#include <windows.h>
-#include <shellapi.h>
-
-// nsIconChannel methods
-nsIconChannel::nsIconChannel()
-{
-  NS_INIT_REFCNT();
-  mStatus = NS_OK;
-}
-
-nsIconChannel::~nsIconChannel() 
-{}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsIconChannel, 
-                              nsIChannel, 
-                              nsIRequest)
-
-nsresult nsIconChannel::Init(nsIURI* uri)
-{
-  nsresult rv;
-  NS_ASSERTION(uri, "no uri");
-  mUrl = uri;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP nsIconChannel::GetName(PRUnichar* *result)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::IsPending(PRBool *result)
-{
-  NS_NOTREACHED("nsIconChannel::IsPending");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetStatus(nsresult *status)
-{
-  *status = mStatus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::Cancel(nsresult status)
-{
-  NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
-  nsresult rv = NS_ERROR_FAILURE;
-
-  mStatus = status;
-  return rv;
-}
-
-NS_IMETHODIMP nsIconChannel::Suspend(void)
-{
-  NS_NOTREACHED("nsIconChannel::Suspend");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::Resume(void)
-{
-  NS_NOTREACHED("nsIconChannel::Resume");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP nsIconChannel::GetOriginalURI(nsIURI* *aURI)
-{
-  *aURI = mOriginalURI ? mOriginalURI : mUrl;
-  NS_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOriginalURI(nsIURI* aURI)
-{
-  mOriginalURI = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetURI(nsIURI* *aURI)
-{
-  *aURI = mUrl;
-  NS_IF_ADDREF(*aURI);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetURI(nsIURI* aURI)
-{
-  mUrl = aURI;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::Open(nsIInputStream **_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-void InvertRows(unsigned char * aInitialBuffer, PRUint32 sizeOfBuffer, PRUint32 numBytesPerRow)
-{
-  PRUint32 numRows = sizeOfBuffer / numBytesPerRow;
-  void * temporaryRowHolder = (void *) nsMemory::Alloc(numBytesPerRow);
-
-  PRUint32 currentRow = 0;
-  PRUint32 lastRow = (numRows - 1) * numBytesPerRow;
-  while (currentRow < lastRow)
-  {
-    // store the current row into a temporary buffer
-    nsCRT::memcpy(temporaryRowHolder, (void *) &aInitialBuffer[currentRow], numBytesPerRow);
-    nsCRT::memcpy((void *) &aInitialBuffer[currentRow], (void *)&aInitialBuffer[lastRow], numBytesPerRow);
-    nsCRT::memcpy((void *) &aInitialBuffer[lastRow], temporaryRowHolder, numBytesPerRow);
-    lastRow -= numBytesPerRow;
-    currentRow += numBytesPerRow;
-  }
-}
-
-NS_IMETHODIMP nsIconChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-  // get the file name from the url
-  nsXPIDLCString fileName; // will contain a dummy file we'll use to figure out the type of icon desired.
-  nsXPIDLCString filePath; // will contain an optional parameter for small vs. large icon. default is small
-  mUrl->GetHost(getter_Copies(fileName));
-  nsCOMPtr<nsIURL> url (do_QueryInterface(mUrl));
-  if (url)
-    url->GetFileBaseName(getter_Copies(filePath));
-
-  
-  // 1) get a hIcon for the file.
-  SHFILEINFO      sfi;
-  UINT infoFlags = SHGFI_USEFILEATTRIBUTES | SHGFI_ICON;
-  if (filePath && !nsCRT::strcmp(filePath, "large"))
-    infoFlags |= SHGFI_LARGEICON;
-  else // default to small
-    infoFlags |= SHGFI_SMALLICON;
-
-  LONG result= SHGetFileInfo(fileName, FILE_ATTRIBUTE_ARCHIVE, &sfi, sizeof(sfi), infoFlags);
-  if (result > 0 && sfi.hIcon)
-  {
-    // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....
-    ICONINFO pIconInfo;
-    result = GetIconInfo(sfi.hIcon, &pIconInfo);
-    if (result > 0)
-    {
-      // now we have the bit map we need to get info about the bitmap
-      BITMAPINFO pBitMapInfo;
-      BITMAPINFOHEADER pBitMapInfoHeader;
-      pBitMapInfo.bmiHeader.biBitCount = 0;
-      pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
-
-      HDC pDC = CreateCompatibleDC(NULL); // get a device context for the screen.
-      result = GetDIBits(pDC, pIconInfo.hbmColor, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
-      if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
-      {
-        // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
-        unsigned char * buffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
-        result = GetDIBits(pDC, pIconInfo.hbmColor, 0, pBitMapInfo.bmiHeader.biHeight, (void *) buffer, &pBitMapInfo, DIB_RGB_COLORS);
-        if (result > 0)
-        {
-          PRUint32 bytesPerPixel = pBitMapInfo.bmiHeader.biBitCount / 8;
-          InvertRows(buffer, pBitMapInfo.bmiHeader.biSizeImage, pBitMapInfo.bmiHeader.biWidth * bytesPerPixel);
-          // Convert our little icon buffer which is padded to 4 bytes per pixel into a nice 3 byte per pixel
-          // description.
-          nsCString iconBuffer;
-          iconBuffer.Assign((char) pBitMapInfo.bmiHeader.biWidth);
-          iconBuffer.Append((char) pBitMapInfo.bmiHeader.biHeight);
-          
-          PRInt32 index = 0;
-          if (pBitMapInfo.bmiHeader.biBitCount == 16)
-          {
-            PRUint8 redValue, greenValue, blueValue, partialGreen;
-            while (index < pBitMapInfo.bmiHeader.biSizeImage)
-            {                            
-              DWORD dst=(DWORD) buffer[index];
-              PRUint16 num = 0;
-              num = (PRUint8) buffer[index];
-              num <<= 8;
-              num |= (PRUint8) buffer[index+1];
-
-              //blueValue = (PRUint8)((*dst)&(0x1F));
-              //greenValue = (PRUint8)(((*dst)>>5)&(0x1F));
-              //redValue = (PRUint8)(((*dst)>>10)&(0x1F));
-
-              redValue = ((PRUint32) (((float)(num & 0x7c00) / 0x7c00) * 0xFF0000) & 0xFF0000)>> 16;
-              greenValue =  ((PRUint32)(((float)(num & 0x03E0) / 0x03E0) * 0x00FF00) & 0x00FF00)>> 8;
-              blueValue =  ((PRUint32)(((float)(num & 0x001F) / 0x001F) * 0x0000FF) & 0x0000FF);
-
-              // now we have the right RGB values...
-              iconBuffer.Append((char) redValue);
-              iconBuffer.Append((char) greenValue);
-              iconBuffer.Append((char) blueValue);
-              index += bytesPerPixel;
-            }
-          }
-          else
-          {
-            while (index <pBitMapInfo.bmiHeader.biSizeImage)
-            {
-              iconBuffer.Append((char) buffer[index]);
-              iconBuffer.Append((char) buffer[index+1]);
-              iconBuffer.Append((char) buffer[index+2]);
-              index += bytesPerPixel;
-            }
-          }
-
-          // now we need to tack on the alpha data...which is hbmMask
-          pBitMapInfo.bmiHeader.biBitCount = 0;
-          pBitMapInfo.bmiHeader.biSize = sizeof(pBitMapInfoHeader);
-          result = GetDIBits(pDC, pIconInfo.hbmMask, 0, 0, NULL, &pBitMapInfo, DIB_RGB_COLORS);
-          if (result > 0 && pBitMapInfo.bmiHeader.biSizeImage > 0)
-          {
-            // allocate a buffer to hold the bit map....this should be a buffer that's biSizeImage...
-            unsigned char * maskBuffer = (PRUint8 *) nsMemory::Alloc(pBitMapInfo.bmiHeader.biSizeImage);
-            result = GetDIBits(pDC, pIconInfo.hbmMask, 0, pBitMapInfo.bmiHeader.biHeight, (void *) maskBuffer, &pBitMapInfo, DIB_RGB_COLORS);
-            if (result > 0)
-            {
-              InvertRows(maskBuffer, pBitMapInfo.bmiHeader.biSizeImage, 4);
-              index = 0;
-              // for some reason the bit mask on windows are flipped from the values we really want for transparency. 
-              // So complement each byte in the bit mask.
-              while (index < pBitMapInfo.bmiHeader.biSizeImage)
-              {
-                maskBuffer[index]^=255;
-                index += 1;
-              }
-              iconBuffer.Append((char *) maskBuffer, pBitMapInfo.bmiHeader.biSizeImage);
-            }
-
-            nsMemory::Free(maskBuffer);
-          } // if we have a mask buffer to apply
-
-          // turn our nsString into a stream looking object...
-          aListener->OnStartRequest(this, ctxt);
-
-          // turn our string into a stream...
-          nsCOMPtr<nsISupports> streamSupports;
-          NS_NewByteInputStream(getter_AddRefs(streamSupports), iconBuffer.get(), iconBuffer.Length());
-
-          nsCOMPtr<nsIInputStream> inputStr (do_QueryInterface(streamSupports));
-          aListener->OnDataAvailable(this, ctxt, inputStr, 0, iconBuffer.Length());
-          aListener->OnStopRequest(this, ctxt, NS_OK, nsnull);
-
-        } // if we got valid bits for the main bitmap mask
-        
-        nsMemory::Free(buffer);
-
-      }
-
-      DeleteDC(pDC);
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-  mLoadAttributes = aLoadAttributes;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentType(char* *aContentType) 
-{
-  if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-  *aContentType = nsCRT::strdup("image/icon");
-  if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIconChannel::SetContentType(const char *aContentType)
-{
-  //It doesn't make sense to set the content-type on this type
-  // of channel...
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsIconChannel::GetContentLength(PRInt32 *aContentLength)
-{
-  *aContentLength = mContentLength;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetContentLength(PRInt32 aContentLength)
-{
-  NS_NOTREACHED("nsIconChannel::SetContentLength");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsIconChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-  mLoadGroup = aLoadGroup;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetOwner(nsISupports* *aOwner)
-{
-  *aOwner = mOwner.get();
-  NS_IF_ADDREF(*aOwner);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetOwner(nsISupports* aOwner)
-{
-  mOwner = aOwner;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-  *aNotificationCallbacks = mCallbacks.get();
-  NS_IF_ADDREF(*aNotificationCallbacks);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-  mCallbacks = aNotificationCallbacks;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsIconChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-  *aSecurityInfo = nsnull;
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Brian Ryner.
- * Portions created by Brian Ryner are Copyright (C) 2000 Brian Ryner.
- * All Rights Reserved.
- *
- * Contributor(s): 
- *  Scott MacGregor <mscott@netscape.com>
- */
-
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIURI.h"
-
-class nsIconChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUEST
-  NS_DECL_NSICHANNEL
-
-  nsIconChannel();
-  virtual ~nsIconChannel();
-
-  nsresult Init(nsIURI* uri);
-
-protected:
-  nsCOMPtr<nsIURI> mUrl;
-  nsCOMPtr<nsIURI> mOriginalURI;
-  PRUint32         mLoadAttributes;
-  PRInt32          mContentLength;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-  nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
-  nsCOMPtr<nsISupports>  mOwner; 
-  nsresult mStatus;
-};
-
-#endif /* nsIconChannel_h___ */

mozilla/modules/libpr0n/decoders/jpeg/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgjpeg
-LIBRARY_NAME	= imgjpeg
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom string necko layout jpeg gfx2 imglib2
-
-CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
-
-EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/jpeg/makefile.win

@@ -1,52 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgjpeg
-LIBRARY_NAME	= imgjpeg
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsJPEGDecoder.obj \
-		.\$(OBJDIR)\nsJPEGFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\jpeg3250.lib \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp

@@ -1,829 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsJPEGDecoder.h"
-
-#include "nsIInputStream.h"
-
-#include "nspr.h"
-
-#include "nsCRT.h"
-
-#include "nsIComponentManager.h"
-
-#include "imgIContainerObserver.h"
-
-
-#include "ImageLogging.h"
-
-
-NS_IMPL_ISUPPORTS2(nsJPEGDecoder, imgIDecoder, nsIOutputStream)
-
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo *gJPEGlog = PR_NewLogModule("JPEGDecoder");
-#else
-#define gJPEGlog
-#endif
-
-
-
-void PR_CALLBACK init_source (j_decompress_ptr jd);
-boolean PR_CALLBACK fill_input_buffer (j_decompress_ptr jd);
-void PR_CALLBACK skip_input_data (j_decompress_ptr jd, long num_bytes);
-void PR_CALLBACK term_source (j_decompress_ptr jd);
-void PR_CALLBACK my_error_exit (j_common_ptr cinfo);
-
-/* Normal JFIF markers can't have more bytes than this. */
-#define MAX_JPEG_MARKER_LENGTH  (((PRUint32)1 << 16) - 1)
-
-
-/* Possible states for JPEG source manager */
-enum data_source_state {
-    READING_BACK = 0, /* Must be zero for init purposes */
-    READING_NEW
-};
-
-/*
- *  Implementation of a JPEG src object that understands our state machine
- */
-typedef struct {
-  /* public fields; must be first in this struct! */
-  struct jpeg_source_mgr pub;
-
-  nsJPEGDecoder *decoder;
-
-} decoder_source_mgr;
-
-
-nsJPEGDecoder::nsJPEGDecoder()
-{
-  NS_INIT_ISUPPORTS();
-
-  mState = JPEG_HEADER;
-  mFillState = READING_BACK;
-
-  mSamples = nsnull;
-  mSamples3 = nsnull;
-  mRGBPadRow = nsnull;
-  mRGBPadRowLength = 0;
-
-  mBytesToSkip = 0;
-  
-  memset(&mInfo, 0, sizeof(jpeg_decompress_struct));
-
-  mCompletedPasses = 0;
-
-  mBuffer = nsnull;
-  mBufferLen = mBufferSize = 0;
-
-  mBackBuffer = nsnull;
-  mBackBufferLen = mBackBufferSize = mBackBufferUnreadLen = 0;
-
-}
-
-nsJPEGDecoder::~nsJPEGDecoder()
-{
-  if (mBuffer)
-    PR_Free(mBuffer);
-  if (mBackBuffer)
-    PR_Free(mBackBuffer);
-  if (mRGBPadRow)
-    PR_Free(mRGBPadRow);
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsJPEGDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-  mObserver = do_QueryInterface(mRequest);
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  /* We set up the normal JPEG error routines, then override error_exit. */
-  mInfo.err = jpeg_std_error(&mErr.pub);
-  /*   mInfo.err = jpeg_std_error(&mErr.pub); */
-  mErr.pub.error_exit = my_error_exit;
-  /* Establish the setjmp return context for my_error_exit to use. */
-  if (setjmp(mErr.setjmp_buffer)) {
-    /* If we get here, the JPEG code has signaled an error.
-     * We need to clean up the JPEG object, close the input file, and return.
-     */
-    return NS_ERROR_FAILURE;
-  }
-
-  /* Step 1: allocate and initialize JPEG decompression object */
-  jpeg_create_decompress(&mInfo);
-  
-  decoder_source_mgr *src;
-  if (mInfo.src == NULL) {
-    //mInfo.src = PR_NEWZAP(decoder_source_mgr);
-    src = PR_NEWZAP(decoder_source_mgr);
-    if (!src) {
-      return PR_FALSE;
-    }
-    mInfo.src = (struct jpeg_source_mgr *) src;
-  }
-
-  /* Step 2: specify data source (eg, a file) */
-
-  /* Setup callback functions. */
-  src->pub.init_source = init_source;
-  src->pub.fill_input_buffer = fill_input_buffer;
-  src->pub.skip_input_data = skip_input_data;
-  src->pub.resync_to_restart = jpeg_resync_to_restart;
-  src->pub.term_source = term_source;
-
-  src->decoder = this;
-
-
-
-  return NS_OK;
-}
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsJPEGDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsJPEGDecoder::Close()
-{
-  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-         ("[this=%p] nsJPEGDecoder::Close\n", this));
-
-  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
-    NS_WARNING("Never finished decoding the JPEG.");
-
-  /* Step 8: Release JPEG decompression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_decompress(&mInfo);
-
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsJPEGDecoder::Flush()
-{
-  LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::Flush");
-
-  PRUint32 ret;
-  if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
-    return this->WriteFrom(nsnull, 0, &ret);
-
-  return NS_OK;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  LOG_SCOPE_WITH_PARAM(gJPEGlog, "nsJPEGDecoder::WriteFrom", "count", count);
-
-  /* We use our private extension JPEG error handler.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  // XXX above what is this?
-
-
-  if (inStr) {
-    if (!mBuffer) {
-      mBuffer = (JOCTET *)PR_Malloc(count);
-      mBufferSize = count;
-    } else if (count > mBufferSize) {
-      mBuffer = (JOCTET *)PR_Realloc(mBuffer, count);
-      mBufferSize = count;
-    }
-
-    nsresult rv = inStr->Read((char*)mBuffer, count, &mBufferLen);
-    *_retval = mBufferLen;
-
-    //nsresult rv = mOutStream->WriteFrom(inStr, count, _retval);
-
-    NS_ASSERTION(NS_SUCCEEDED(rv), "nsJPEGDecoder::WriteFrom -- mOutStream->WriteFrom failed");
-  }
-  // else no input stream.. Flush() ?
-
-
-  nsresult error_code = NS_ERROR_FAILURE;
-  /* Return here if there is a fatal error. */
-  if ((error_code = setjmp(mErr.setjmp_buffer)) != 0) {
-    return error_code;
-  }
-
-
-  PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-         ("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this));
-
-  decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
-
-  switch (mState) {
-  case JPEG_HEADER:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_HEADER case");
-
-    /* Step 3: read file parameters with jpeg_read_header() */
-    if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED)
-      return NS_OK; /* I/O suspension */
-
-    /*
-     * Don't allocate a giant and superfluous memory buffer
-     * when the image is a sequential JPEG.
-     */
-    mInfo.buffered_image = jpeg_has_multiple_scans(&mInfo);
-
-    /* Used to set up image size so arrays can be allocated */
-    jpeg_calc_output_dimensions(&mInfo);
-
-    mObserver->OnStartDecode(nsnull, nsnull);
-
-    mImage->Init(mInfo.image_width, mInfo.image_height, mObserver);
-    mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-    mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-    gfx_format format;
-#ifdef XP_PC
-    format = gfxIFormats::BGR;
-#else
-    format = gfxIFormats::RGB;
-#endif
-    mFrame->Init(0, 0, mInfo.image_width, mInfo.image_height, format);
-    mImage->AppendFrame(mFrame);
-    mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-
-
-    /*
-     * Make a one-row-high sample array that will go away
-     * when done with image. Always make it big enough to
-     * hold an RGB row.  Since this uses the IJG memory
-     * manager, it must be allocated before the call to
-     * jpeg_start_compress().
-     */
-    int row_stride;
-
-    if(mInfo.output_components == 1)
-      row_stride = mInfo.output_width;
-    else
-      row_stride = mInfo.output_width * 4; // use 4 instead of mInfo.output_components
-                                           // so we don't have to fuss with byte alignment.
-                                           // Mac wants 4 anyways.
-
-    mSamples = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
-                                           JPOOL_IMAGE,
-                                           row_stride, 1);
-
-#if defined(XP_PC) || defined(XP_MAC)
-    // allocate buffer to do byte flipping if needed
-    if (mInfo.output_components == 3) {
-      mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride);
-      mRGBPadRowLength = row_stride;
-      memset(mRGBPadRow, 0, mRGBPadRowLength);
-    }
-#endif
-
-    /* Allocate RGB buffer for conversion from greyscale. */
-    if (mInfo.output_components != 3) {
-      row_stride = mInfo.output_width * 4;
-      mSamples3 = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo,
-                                              JPOOL_IMAGE,
-                                              row_stride, 1);
-    }
-
-    mState = JPEG_START_DECOMPRESS;
-  }
-  case JPEG_START_DECOMPRESS:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_START_DECOMPRESS case");
-    /* Step 4: set parameters for decompression */
-
-    /* FIXME -- Should reset dct_method and dither mode
-     * for final pass of progressive JPEG
-     */
-    mInfo.dct_method = JDCT_FASTEST;
-    mInfo.dither_mode = JDITHER_ORDERED;
-    mInfo.do_fancy_upsampling = FALSE;
-    mInfo.enable_2pass_quant = FALSE;
-    mInfo.do_block_smoothing = TRUE;
-
-    /* Step 5: Start decompressor */
-    if (jpeg_start_decompress(&mInfo) == FALSE)
-      return NS_OK; /* I/O suspension */
-
-    /* If this is a progressive JPEG ... */
-    if (mInfo.buffered_image) {
-      mState = JPEG_DECOMPRESS_PROGRESSIVE;
-    } else {
-      mState = JPEG_DECOMPRESS_SEQUENTIAL;
-    }
-
-  }
-
-  case JPEG_DECOMPRESS_SEQUENTIAL:
-  {
-    if (mState == JPEG_DECOMPRESS_SEQUENTIAL)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_SEQUENTIAL case");
-
-      if (OutputScanlines(-1) == PR_FALSE)
-        return NS_OK; /* I/O suspension */
-
-      /* If we've completed image output ... */
-      NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!");
-      mState = JPEG_DONE;    
-    }
-  }
-
-
-  case JPEG_DECOMPRESS_PROGRESSIVE:
-  {
-    if (mState == JPEG_DECOMPRESS_PROGRESSIVE)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_PROGRESSIVE case");
-
-      int status;
-      do {
-        status = jpeg_consume_input(&mInfo);
-      } while (!((status == JPEG_SUSPENDED) ||
-                 (status == JPEG_REACHED_EOI)));
-
-      switch (status) {
-        case JPEG_REACHED_EOI:
-          // End of image
-          mState = JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT;
-          break;
-        case JPEG_SUSPENDED:
-          PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-                 ("[this=%p] nsJPEGDecoder::WriteFrom -- suspending\n", this));
-
-          return NS_OK; /* I/O suspension */
-        default:
-          printf("got someo other state!?\n");
-      }
-    }
-  }
-
-  case JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT:
-  {
-    if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
-    {
-      LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT case");
-
-      // XXX progressive? ;)
-      // not really progressive according to the state machine... -saari
-      jpeg_start_output(&mInfo, mInfo.input_scan_number);
-      if (OutputScanlines(-1) == PR_FALSE)
-        return NS_OK; /* I/O suspension */
-      jpeg_finish_output(&mInfo);
-      mState = JPEG_DONE;
-    }
-  }
-
-  case JPEG_DONE:
-  {
-    LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_DONE case");
-
-    /* Step 7: Finish decompression */
-
-    if (jpeg_finish_decompress(&mInfo) == FALSE)
-      return NS_OK; /* I/O suspension */
-
-    mState = JPEG_SINK_NON_JPEG_TRAILER;
-
-    /* we're done dude */
-    break;
-  }
-  case JPEG_SINK_NON_JPEG_TRAILER:
-    PR_LOG(gJPEGlog, PR_LOG_DEBUG,
-           ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this));
-
-    break;
-  }
-
-  return NS_OK;
-}
-
-
-int
-nsJPEGDecoder::OutputScanlines(int num_scanlines)
-{
-  int pass = 0;
-  
-  if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT)
-      pass = -1;
-  else
-      pass = mCompletedPasses + 1;
-
-  while ((mInfo.output_scanline < mInfo.output_height) && num_scanlines--) {
-      JSAMPROW samples;
-      
-      /* Request one scanline.  Returns 0 or 1 scanlines. */
-      int ns = jpeg_read_scanlines(&mInfo, mSamples, 1);
-      
-      if (ns != 1) {
-        return PR_FALSE; /* suspend */
-      }
-
-      /* If grayscale image ... */
-      if (mInfo.output_components == 1) {
-        JSAMPLE j;
-        JSAMPLE *j1 = mSamples[0];
-        const JSAMPLE *j1end = j1 + mInfo.output_width;
-        JSAMPLE *j3 = mSamples3[0];
-
-        /* Convert from grayscale to RGB. */
-        while (j1 < j1end) {
-#ifdef XP_MAC
-          j = *j1++;
-          j3[0] = 0;
-          j3[1] = j;
-          j3[2] = j;
-          j3[3] = j;
-          j3 += 4;
-#else
-          j = *j1++;
-          j3[0] = j;
-          j3[1] = j;
-          j3[2] = j;
-          j3 += 3;
-#endif
-        }
-        samples = mSamples3[0];
-      } else {
-        /* 24-bit color image */
-#ifdef XP_PC
-        memset(mRGBPadRow, 0, mInfo.output_width * 4);
-        PRUint8 *ptrOutputBuf = mRGBPadRow;
-
-        JSAMPLE *j1 = mSamples[0];
-        for (PRUint32 i=0;i<mInfo.output_width;++i) {
-          ptrOutputBuf[2] = *j1++;
-          ptrOutputBuf[1] = *j1++;
-          ptrOutputBuf[0] = *j1++;
-          ptrOutputBuf += 3;
-        }
-
-        samples = mRGBPadRow;
-#else
-#ifdef XP_MAC
-        memset(mRGBPadRow, 0, mInfo.output_width * 4);
-        PRUint8 *ptrOutputBuf = mRGBPadRow;
-
-        JSAMPLE *j1 = mSamples[0];
-        for (PRUint32 i=0;i<mInfo.output_width;++i) {
-          ptrOutputBuf[0] = 0;
-          ptrOutputBuf[1] = *j1++;
-          ptrOutputBuf[2] = *j1++;
-          ptrOutputBuf[3] = *j1++;
-          ptrOutputBuf += 4;
-        }
-
-        samples = mRGBPadRow;
-#else
-        samples = mSamples[0];
-#endif
-#endif
-      }
-
-      PRUint32 bpr;
-      mFrame->GetImageBytesPerRow(&bpr);
-      mFrame->SetImageData(
-        samples,             // data
-        bpr,                 // length
-        (mInfo.output_scanline-1) * bpr); // offset
-
-      nsRect r(0, mInfo.output_scanline, mInfo.output_width, 1);
-      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-  }
-
-  return PR_TRUE;
-}
-
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsJPEGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsJPEGDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsJPEGDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsJPEGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsJPEGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-
-
-/* Override the standard error method in the IJG JPEG decoder code. */
-void PR_CALLBACK
-my_error_exit (j_common_ptr cinfo)
-{
-  nsresult error_code = NS_ERROR_FAILURE;
-  decoder_error_mgr *err = (decoder_error_mgr *) cinfo->err;
-
-#if 0
-#ifdef DEBUG
-/*ptn fix later */
-  if (il_debug >= 1) {
-      char buffer[JMSG_LENGTH_MAX];
-
-      /* Create the message */
-      (*cinfo->err->format_message) (cinfo, buffer);
-
-      ILTRACE(1,("%s\n", buffer));
-  }
-#endif
-
-
-  /* Convert error to a browser error code */
-  if (cinfo->err->msg_code == JERR_OUT_OF_MEMORY)
-      error_code = MK_OUT_OF_MEMORY;
-  else
-      error_code = MK_IMAGE_LOSSAGE;
-#endif
-
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-  fprintf(stderr, "my_error_exit()\n%s\n", buffer);
-
-  /* Return control to the setjmp point. */
-  longjmp(err->setjmp_buffer, error_code);
-}
-
-/******************************************************************************/
-/*-----------------------------------------------------------------------------
- * This is the callback routine from the IJG JPEG library used to supply new
- * data to the decompressor when its input buffer is exhausted.  It juggles
- * multiple buffers in an attempt to avoid unnecessary copying of input data.
- *
- * (A simpler scheme is possible: It's much easier to use only a single
- * buffer; when fill_input_buffer() is called, move any unconsumed data
- * (beyond the current pointer/count) down to the beginning of this buffer and
- * then load new data into the remaining buffer space.  This approach requires
- * a little more data copying but is far easier to get right.)
- *
- * At any one time, the JPEG decompressor is either reading from the necko
- * input buffer, which is volatile across top-level calls to the IJG library,
- * or the "backtrack" buffer.  The backtrack buffer contains the remaining
- * unconsumed data from the necko buffer after parsing was suspended due
- * to insufficient data in some previous call to the IJG library.
- *
- * When suspending, the decompressor will back up to a convenient restart
- * point (typically the start of the current MCU). The variables
- * next_input_byte & bytes_in_buffer indicate where the restart point will be
- * if the current call returns FALSE.  Data beyond this point must be
- * rescanned after resumption, so it must be preserved in case the decompressor
- * decides to backtrack.
- *
- * Returns:
- *  TRUE if additional data is available, FALSE if no data present and
- *   the JPEG library should therefore suspend processing of input stream
- *---------------------------------------------------------------------------*/
-
-/******************************************************************************/
-/* data source manager method 
-/******************************************************************************/
-
-
-/******************************************************************************/
-/* data source manager method 
-	Initialize source.  This is called by jpeg_read_header() before any
-	data is actually read.  May leave
-	bytes_in_buffer set to 0 (in which case a fill_input_buffer() call
-	will occur immediately).
-*/
-void PR_CALLBACK
-init_source (j_decompress_ptr jd)
-{
-}
-
-/******************************************************************************/
-/* data source manager method
-	Skip num_bytes worth of data.  The buffer pointer and count should
-	be advanced over num_bytes input bytes, refilling the buffer as
-	needed.  This is used to skip over a potentially large amount of
-	uninteresting data (such as an APPn marker).  In some applications
-	it may be possible to optimize away the reading of the skipped data,
-	but it's not clear that being smart is worth much trouble; large
-	skips are uncommon.  bytes_in_buffer may be zero on return.
-	A zero or negative skip count should be treated as a no-op.
-*/
-void PR_CALLBACK
-skip_input_data (j_decompress_ptr jd, long num_bytes)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  if (num_bytes > (long)src->pub.bytes_in_buffer) {
-    /*
-     * Can't skip it all right now until we get more data from
-     * network stream. Set things up so that fill_input_buffer
-     * will skip remaining amount.
-     */
-    src->decoder->mBytesToSkip = (size_t)num_bytes - src->pub.bytes_in_buffer;
-    src->pub.next_input_byte += src->pub.bytes_in_buffer;
-    src->pub.bytes_in_buffer = 0;
-
-  } else {
-    /* Simple case. Just advance buffer pointer */
-
-    src->pub.bytes_in_buffer -= (size_t)num_bytes;
-    src->pub.next_input_byte += num_bytes;
-  }
-}
-
-
-/******************************************************************************/
-/* data source manager method
-	This is called whenever bytes_in_buffer has reached zero and more
-	data is wanted.  In typical applications, it should read fresh data
-	into the buffer (ignoring the current state of next_input_byte and
-	bytes_in_buffer), reset the pointer & count to the start of the
-	buffer, and return TRUE indicating that the buffer has been reloaded.
-	It is not necessary to fill the buffer entirely, only to obtain at
-	least one more byte.  bytes_in_buffer MUST be set to a positive value
-	if TRUE is returned.  A FALSE return should only be used when I/O
-	suspension is desired.
-*/
-boolean PR_CALLBACK
-fill_input_buffer (j_decompress_ptr jd)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  unsigned char *new_buffer = (unsigned char *)src->decoder->mBuffer;
-  PRUint32 new_buflen = src->decoder->mBufferLen;
-  PRUint32 bytesToSkip = src->decoder->mBytesToSkip;
-
-  switch(src->decoder->mFillState) {
-  case READING_BACK:
-    {
-      if (!new_buffer || new_buflen == 0)
-        return PR_FALSE; /* suspend */
-
-      src->decoder->mBufferLen = 0;
-
-      if (bytesToSkip != 0) {
-        if (bytesToSkip < new_buflen) {
-          /* All done skipping bytes; Return what's left. */
-          new_buffer += bytesToSkip;
-          new_buflen -= bytesToSkip;
-          src->decoder->mBytesToSkip = 0;
-        } else {
-          /* Still need to skip some more data in the future */
-          src->decoder->mBytesToSkip -= (size_t)new_buflen;
-          return PR_FALSE; /* suspend */
-        }
-      }
-
-      src->decoder->mBackBufferUnreadLen = src->pub.bytes_in_buffer;
-
-      src->pub.next_input_byte = new_buffer;
-      src->pub.bytes_in_buffer = (size_t)new_buflen;
-      src->decoder->mFillState = READING_NEW;
-
-      return PR_TRUE;
-    }
-    break;
-
-  case READING_NEW:
-    {
-      if (src->pub.next_input_byte != src->decoder->mBuffer) {
-        /* Backtrack data has been permanently consumed. */
-        src->decoder->mBackBufferUnreadLen = 0;
-        src->decoder->mBackBufferLen = 0;
-      }
-
-      /* Save remainder of netlib buffer in backtrack buffer */
-      PRUint32 new_backtrack_buflen = src->pub.bytes_in_buffer + src->decoder->mBackBufferLen;
-
-
-      /* Make sure backtrack buffer is big enough to hold new data. */
-      if (src->decoder->mBackBufferSize < new_backtrack_buflen) {
-
-        /* Round up to multiple of 16 bytes. */
-        PRUint32 roundup_buflen = ((new_backtrack_buflen + 15) >> 4) << 4;
-        if (src->decoder->mBackBufferSize) {
-            src->decoder->mBackBuffer =
-          (JOCTET *)PR_REALLOC(src->decoder->mBackBuffer, roundup_buflen);
-        } else {
-          src->decoder->mBackBuffer = (JOCTET*)PR_MALLOC(roundup_buflen);
-        }
-
-        /* Check for OOM */
-        if (!src->decoder->mBackBuffer) {
-#if 0
-          j_common_ptr cinfo = (j_common_ptr)(&src->js->jd);
-          cinfo->err->msg_code = JERR_OUT_OF_MEMORY;
-          my_error_exit(cinfo);
-#endif
-        }
-          
-        src->decoder->mBackBufferSize = (size_t)roundup_buflen;
-
-        /* Check for malformed MARKER segment lengths. */
-        if (new_backtrack_buflen > MAX_JPEG_MARKER_LENGTH) {
-          my_error_exit((j_common_ptr)(&src->decoder->mInfo));
-        }
-      }
-
-
-      /* Copy remainder of netlib buffer into backtrack buffer. */
-      nsCRT::memmove(src->decoder->mBackBuffer + src->decoder->mBackBufferLen,
-                     src->pub.next_input_byte,
-                     src->pub.bytes_in_buffer);
-
-
-      /* Point to start of data to be rescanned. */
-      src->pub.next_input_byte = src->decoder->mBackBuffer + src->decoder->mBackBufferLen - src->decoder->mBackBufferUnreadLen;
-      src->pub.bytes_in_buffer += src->decoder->mBackBufferUnreadLen;
-      src->decoder->mBackBufferLen = (size_t)new_backtrack_buflen;
-    
-      src->decoder->mFillState = READING_BACK;
-
-      return PR_FALSE;
-    }
-    break;
-  }
-
-  return PR_FALSE;
-}
-
-/******************************************************************************/
-/* data source manager method */
-/*
- * Terminate source --- called by jpeg_finish_decompress() after all
- * data has been read to clean up JPEG source manager. NOT called by 
- * jpeg_abort() or jpeg_destroy().
- */
-void PR_CALLBACK
-term_source (j_decompress_ptr jd)
-{
-  decoder_source_mgr *src = (decoder_source_mgr *)jd->src;
-
-  if (src->decoder->mObserver) {
-    src->decoder->mObserver->OnStopFrame(nsnull, nsnull, src->decoder->mFrame);
-    src->decoder->mObserver->OnStopContainer(nsnull, nsnull, src->decoder->mImage);
-    src->decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-
-    /* No work necessary here */
-}

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.h

@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsJPEGDecoder_h__
-#define nsJPEGDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "gfxIImageFrame.h"
-#include "imgIDecoderObserver.h"
-#include "imgIRequest.h"
-#include "nsIInputStream.h"
-#include "nsIPipe.h"
-
-extern "C" {
-#include "jpeglib.h"
-}
-
-#include <setjmp.h>
-
-#define NS_JPEGDECODER_CID \
-{ /* 5871a422-1dd2-11b2-ab3f-e2e56be5da9c */         \
-     0x5871a422,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xab, 0x3f, 0xe2, 0xe5, 0x6b, 0xe5, 0xda, 0x9c} \
-}
-
-typedef struct {
-    struct jpeg_error_mgr pub;  /* "public" fields for IJG library*/
-    jmp_buf setjmp_buffer;      /* For handling catastropic errors */
-} decoder_error_mgr;
-
-
-typedef enum {
-    JPEG_HEADER,                          /* Reading JFIF headers */
-    JPEG_START_DECOMPRESS,
-    JPEG_DECOMPRESS_PROGRESSIVE,          /* Output progressive pixels */
-    JPEG_DECOMPRESS_SEQUENTIAL,           /* Output sequential pixels */
-    JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT,
-    JPEG_DONE,
-    JPEG_SINK_NON_JPEG_TRAILER,          /* Some image files have a */
-                                         /* non-JPEG trailer */
-    JPEG_ERROR    
-} jstate;
-
-class nsJPEGDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsJPEGDecoder();
-  virtual ~nsJPEGDecoder();
-
-  PRBool FillInput(j_decompress_ptr jd);
-
-  PRUint32 mBytesToSkip;
-
-protected:
-  int OutputScanlines(int num_scanlines);
-
-public:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-
-  nsCOMPtr<imgIDecoderObserver> mObserver;
-
-  struct jpeg_decompress_struct mInfo;
-  decoder_error_mgr mErr;
-  jstate mState;
-
-  JSAMPARRAY mSamples;
-  JSAMPARRAY mSamples3;
-  PRUint8*   mRGBPadRow;
-  PRUint32   mRGBPadRowLength;
-
-  PRInt32 mCompletedPasses;
-  PRInt32 mPasses;
-
-  int mFillState;
-
-  JOCTET *mBuffer;
-  PRUint32 mBufferLen;  // amount of data currently in mBuffer
-  PRUint32 mBufferSize; // size in bytes what mBuffer was created with
-
-  JOCTET *mBackBuffer;
-  PRUint32 mBackBufferLen; // Offset of end of active backtrack data
-  PRUint32 mBackBufferSize; // size in bytes what mBackBuffer was created with
-  PRUint32 mBackBufferUnreadLen; // amount of data currently in mBackBuffer
-
-
-
-};
-
-#endif // nsJPEGDecoder_h__

mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsJPEGDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "ppm decoder",
-    NS_JPEGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/jpeg",
-    nsJPEGDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsJPEGDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/jpeg/win32.order

@@ -1,16 +0,0 @@
-?Release@nsJPEGDecoder@@UAGKXZ ; 172
-?AddRef@nsJPEGDecoder@@UAGKXZ ; 172
-?fill_input_buffer@@YAEPAUjpeg_decompress_struct@@@Z ; 126
-?skip_input_data@@YAXPAUjpeg_decompress_struct@@J@Z ; 109
-?WriteFrom@nsJPEGDecoder@@UAGIPAVnsIInputStream@@IPAI@Z ; 106
-?OutputScanlines@nsJPEGDecoder@@IAEHH@Z ; 93
-?init_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
-??1nsJPEGDecoder@@UAE@XZ ; 86
-?Close@nsJPEGDecoder@@UAGIXZ ; 86
-?term_source@@YAXPAUjpeg_decompress_struct@@@Z ; 86
-?Init@nsJPEGDecoder@@UAGIPAVimgIRequest@@@Z ; 86
-??0nsJPEGDecoder@@QAE@XZ ; 86
-?Flush@nsJPEGDecoder@@UAGIXZ ; 86
-?QueryInterface@nsJPEGDecoder@@UAGIABUnsID@@PAPAX@Z ; 86
-??_EnsJPEGDecoder@@UAEPAXI@Z ; 86
-_NSGetModule ; 1

mozilla/modules/libpr0n/decoders/makefile.win

@@ -1,26 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH=..\..\..
-
-DIRS = ppm gif png jpeg
-
-!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/decoders/png/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgpng
-LIBRARY_NAME	= imgpng
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom necko layout png gfx2 imglib2
-
-CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
-
-EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/png/makefile.win

@@ -1,53 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgpng
-LIBRARY_NAME	= imgpng
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsPNGDecoder.obj \
-		.\$(OBJDIR)\nsPNGFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\png.lib \
-	$(DIST)\lib\zlib.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp

@@ -1,553 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsPNGDecoder.h"
-
-#include "nsIInputStream.h"
-
-#include "nspr.h"
-
-#include "nsIComponentManager.h"
-
-#include "png.h"
-
-#include "nsIStreamObserver.h"
-
-#include "nsRect.h"
-
-#include "nsMemory.h"
-
-#include "imgIContainerObserver.h"
-
-// XXX we need to be sure to fire onStopDecode messages to mObserver in error cases.
-
-
-NS_IMPL_ISUPPORTS2(nsPNGDecoder, imgIDecoder, nsIOutputStream)
-
-
-nsPNGDecoder::nsPNGDecoder()
-{
-  NS_INIT_ISUPPORTS();
-
-  mPNG = nsnull;
-  mInfo = nsnull;
-  colorLine = 0;
-  alphaLine = 0;
-  interlacebuf = 0;
-}
-
-nsPNGDecoder::~nsPNGDecoder()
-{
-  if (colorLine)
-    nsMemory::Free(colorLine);
-  if (alphaLine)
-    nsMemory::Free(alphaLine);
-  if (interlacebuf)
-    nsMemory::Free(interlacebuf);
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsPNGDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  /* do png init stuff */
-
-  /* Initialize the container's source image header. */
-  /* Always decode to 24 bit pixdepth */
-
-
-  mPNG = png_create_read_struct(PNG_LIBPNG_VER_STRING, 
-                                NULL, NULL, 
-                                NULL);
-  if (!mPNG) {
-    return NS_ERROR_FAILURE;
-  }
-
-  mInfo = png_create_info_struct(mPNG);
-  if (!mInfo) {
-    png_destroy_read_struct(&mPNG, NULL, NULL);
-    return NS_ERROR_FAILURE;
-  }
-
-  /* use ic as libpng "progressive pointer" (retrieve in callbacks) */
-  png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this), nsPNGDecoder::info_callback, nsPNGDecoder::row_callback, nsPNGDecoder::end_callback);
-
-  return NS_OK;
-}
-
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsPNGDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsPNGDecoder::Close()
-{
-  if (mPNG)
-    png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
-
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsPNGDecoder::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-static NS_METHOD ReadDataOut(nsIInputStream* in,
-                             void* closure,
-                             const char* fromRawSegment,
-                             PRUint32 toOffset,
-                             PRUint32 count,
-                             PRUint32 *writeCount)
-{
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, closure);
-
-  // we need to do the setjmp here otherwise bad things will happen
-  if (setjmp(decoder->mPNG->jmpbuf)) {
-    png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
-    // is this NS_ERROR_FAILURE enough?
-
-    decoder->mRequest->Cancel(NS_BINDING_ABORTED); // XXX is this the correct error ?
-
-    return NS_ERROR_FAILURE;
-  }
-
-  *writeCount = decoder->ProcessData((unsigned char*)fromRawSegment, count);
-  return NS_OK;
-}
-
-PRUint32 nsPNGDecoder::ProcessData(unsigned char *data, PRUint32 count)
-{
-  png_process_data(mPNG, mInfo, data, count);
-
-  return count; // we always consume all the data
-}
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-//  PRUint32 sourceOffset = *_retval;
-
-  inStr->ReadSegments(ReadDataOut, this, count, _retval);
-
-  return NS_OK;
-}
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsPNGDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsPNGDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPNGDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsPNGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPNGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-
-
-
-
-
-
-
-
-void
-nsPNGDecoder::info_callback(png_structp png_ptr, png_infop info_ptr)
-{
-/*  int number_passes;   NOT USED  */
-  png_uint_32 width, height;
-  int bit_depth, color_type, interlace_type, compression_type, filter_type;
-  int channels;
-  double LUT_exponent, CRT_exponent = 2.2, display_exponent, aGamma;
-
-  png_bytep trans=NULL;
-  int num_trans =0;
-
-  /* always decode to 24-bit RGB or 32-bit RGBA  */
-  png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-               &interlace_type, &compression_type, &filter_type);
-
-  if (color_type == PNG_COLOR_TYPE_PALETTE)
-    png_set_expand(png_ptr);
-
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    png_set_expand(png_ptr);
-
-  if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-    png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL);
-    png_set_expand(png_ptr);
-  }
-
-  if (bit_depth == 16)
-    png_set_strip_16(png_ptr);
-
-  if (color_type == PNG_COLOR_TYPE_GRAY ||
-      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      png_set_gray_to_rgb(png_ptr);
-
-
-#ifdef XP_PC
-  // windows likes BGR
-  png_set_bgr(png_ptr);
-#endif
-
-  /* set up gamma correction for Mac, Unix and (Win32 and everything else)
-   * using educated guesses for display-system exponents; do preferences
-   * later */
-
-#if defined(XP_MAC)
-  LUT_exponent = 1.8 / 2.61;
-#elif defined(XP_UNIX)
-# if defined(__sgi)
-  LUT_exponent = 1.0 / 1.7;   /* typical default for SGI console */
-# elif defined(NeXT)
-  LUT_exponent = 1.0 / 2.2;   /* typical default for NeXT cube */
-# else
-  LUT_exponent = 1.0;         /* default for most other Unix workstations */
-# endif
-#else
-  LUT_exponent = 1.0;         /* virtually all PCs and most other systems */
-#endif
-
-  /* (alternatively, could check for SCREEN_GAMMA environment variable) */
-  display_exponent = LUT_exponent * CRT_exponent;
-
-  if (png_get_gAMA(png_ptr, info_ptr, &aGamma))
-      png_set_gamma(png_ptr, display_exponent, aGamma);
-  else
-      png_set_gamma(png_ptr, display_exponent, 0.45455);
-
-  /* let libpng expand interlaced images */
-  if (interlace_type == PNG_INTERLACE_ADAM7) {
-      /* number_passes = */
-      png_set_interlace_handling(png_ptr);
-  }
-
-  /* now all of those things we set above are used to update various struct
-   * members and whatnot, after which we can get channels, rowbytes, etc. */
-  png_read_update_info(png_ptr, info_ptr);
-  channels = png_get_channels(png_ptr, info_ptr);
-  PR_ASSERT(channels == 3 || channels == 4);
-
-  /*---------------------------------------------------------------*/
-  /* copy PNG info into imagelib structs (formerly png_set_dims()) */
-  /*---------------------------------------------------------------*/
-
-  PRInt32 alpha_bits = 1;
-
-  if (channels > 3) {
-    /* check if alpha is coming from a tRNS chunk and is binary */
-    if (num_trans) {
-      /* if it's not a indexed color image, tRNS means binary */
-      if (color_type == PNG_COLOR_TYPE_PALETTE) {
-        for (int i=0; i<num_trans; i++) {
-          if ((trans[i] != 0) && (trans[i] != 255)) {
-            alpha_bits = 8;
-            break;
-          }
-        }
-      }
-    } else {
-      alpha_bits = 8;
-    }
-  }
-
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartDecode(nsnull, nsnull);
-
-  // since the png is only 1 frame, initalize the container to the width and height of the frame
-  decoder->mImage->Init(width, height, decoder->mObserver);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartContainer(nsnull, nsnull, decoder->mImage);
-
-  decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-#if 0
-  // XXX should we longjmp to png_ptr->jumpbuf here if we failed?
-  if (!decoder->mFrame)
-    return NS_ERROR_FAILURE;
-#endif
-
-  gfx_format format;
-
-  if (channels == 3) {
-    format = gfxIFormats::RGB;
-  } else if (channels > 3) {
-    if (alpha_bits == 8) {
-      decoder->mImage->GetPreferredAlphaChannelFormat(&format);
-    } else if (alpha_bits == 1) {
-      format = gfxIFormats::RGB_A1;
-    }
-  }
-
-#ifdef XP_PC
-  // XXX this works...
-  format += 1; // RGB to BGR
-#endif
-
-  // then initalize the frame and append it to the container
-  decoder->mFrame->Init(0, 0, width, height, format);
-
-  decoder->mImage->AppendFrame(decoder->mFrame);
-
-  if (decoder->mObserver)
-    decoder->mObserver->OnStartFrame(nsnull, nsnull, decoder->mFrame);
-
-  PRUint32 bpr, abpr;
-  decoder->mFrame->GetImageBytesPerRow(&bpr);
-  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
-  decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
-  if (channels > 3)
-    decoder->alphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
-
-  if (interlace_type == PNG_INTERLACE_ADAM7) {
-    decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels*width*height);
-    decoder->ibpr = channels*width;
-    if (!decoder->interlacebuf) {
-//      return NS_ERROR_FAILURE;
-    }            
-  }
-
-  return;
-}
-
-
-
-
-
-void
-nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
-                           png_uint_32 row_num, int pass)
-{
-  /* libpng comments:
-   *
-   * this function is called for every row in the image.  If the
-   * image is interlacing, and you turned on the interlace handler,
-   * this function will be called for every row in every pass.
-   * Some of these rows will not be changed from the previous pass.
-   * When the row is not changed, the new_row variable will be NULL.
-   * The rows and passes are called in order, so you don't really
-   * need the row_num and pass, but I'm supplying them because it
-   * may make your life easier.
-   *
-   * For the non-NULL rows of interlaced images, you must call
-   * png_progressive_combine_row() passing in the row and the
-   * old row.  You can call this function for NULL rows (it will
-   * just return) and for non-interlaced images (it just does the
-   * memcpy for you) if it will make the code easier.  Thus, you
-   * can just do this for all cases:
-   *
-   *    png_progressive_combine_row(png_ptr, old_row, new_row);
-   *
-   * where old_row is what was displayed for previous rows.  Note
-   * that the first pass (pass == 0 really) will completely cover
-   * the old row, so the rows do not have to be initialized.  After
-   * the first pass (and only for interlaced images), you will have
-   * to pass the current row, and the function will combine the
-   * old row and the new row.
-   */
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  PRUint32 bpr, abpr;
-  decoder->mFrame->GetImageBytesPerRow(&bpr);
-  decoder->mFrame->GetAlphaBytesPerRow(&abpr);
-
-  png_bytep line;
-  if (decoder->interlacebuf) {
-    line = decoder->interlacebuf+(row_num*decoder->ibpr);
-    png_progressive_combine_row(png_ptr, line, new_row);
-  }
-  else
-    line = new_row;
-
-  if (new_row) {
-    nscoord width;
-    decoder->mFrame->GetWidth(&width);
-    PRUint32 iwidth = width;
-
-    gfx_format format;
-    decoder->mFrame->GetFormat(&format);
-    PRUint8 *aptr, *cptr;
-
-// The mac specific ifdefs in the code below are there to make sure we
-// always fill in 4 byte pixels right now, which is what the mac always
-// allocates for its pixel buffers in true color mode. This will change
-// when we start storing images with color palettes when they don't need
-// true color support (GIFs).
-    switch (format) {
-    case gfxIFormats::RGB:
-    case gfxIFormats::BGR:
-#ifdef XP_MAC
-        cptr = decoder->colorLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          *cptr++ = 0;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-#else
-        decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
-#endif
-      break;
-    case gfxIFormats::RGB_A1:
-    case gfxIFormats::BGR_A1:
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        memset(aptr, 0, abpr);
-        for (PRUint32 x=0; x<iwidth; x++) {
-#ifdef XP_MAC
-          *cptr++ = 0;
-#endif
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          if (*line++) {
-            aptr[x>>3] |= 1<<(7-x&0x7);
-          }
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-      break;
-    case gfxIFormats::RGB_A8:
-    case gfxIFormats::BGR_A8:
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-#ifdef XP_MAC
-          *cptr++ = 0;
-#endif
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *aptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-      break;
-    case gfxIFormats::RGBA:
-    case gfxIFormats::BGRA:
-#ifdef XP_MAC
-      {
-        cptr = decoder->colorLine;
-        aptr = decoder->alphaLine;
-        for (PRUint32 x=0; x<iwidth; x++) {
-          *cptr++ = 0;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *cptr++ = *line++;
-          *aptr++ = *line++;
-        }
-        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
-        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
-      }
-#else
-      decoder->mFrame->SetImageData(line, bpr, row_num*bpr);
-#endif
-      break;
-    }
-
-    nsRect r(0, row_num, width, 1);
-    decoder->mObserver->OnDataAvailable(nsnull, nsnull, decoder->mFrame, &r);
-  }
-}
-
-
-
-void
-nsPNGDecoder::end_callback(png_structp png_ptr, png_infop info_ptr)
-{
-  /* libpng comments:
-   *
-   * this function is called when the whole image has been read,
-   * including any chunks after the image (up to and including
-   * the IEND).  You will usually have the same info chunk as you
-   * had in the header, although some data may have been added
-   * to the comments and time fields.
-   *
-   * Most people won't do much here, perhaps setting a flag that
-   * marks the image as finished.
-   */
-
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
-
-  if (decoder->mObserver) {
-    decoder->mObserver->OnStopFrame(nsnull, nsnull, decoder->mFrame);
-    decoder->mObserver->OnStopContainer(nsnull, nsnull, decoder->mImage);
-    decoder->mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-
-}
-

mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.h

@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsPNGDecoder_h__
-#define nsPNGDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-
-#include "nsCOMPtr.h"
-
-#include "png.h"
-
-#define NS_PNGDECODER_CID \
-{ /* 36fa00c2-1dd2-11b2-be07-d16eeb4c50ed */         \
-     0x36fa00c2,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0xbe, 0x07, 0xd1, 0x6e, 0xeb, 0x4c, 0x50, 0xed} \
-}
-
-class nsPNGDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsPNGDecoder();
-  virtual ~nsPNGDecoder();
-
-PR_STATIC_CALLBACK(void)
-info_callback(png_structp png_ptr, png_infop info_ptr);
-PR_STATIC_CALLBACK(void)
-row_callback(png_structp png_ptr, png_bytep new_row,
-             png_uint_32 row_num, int pass);
-
-PR_STATIC_CALLBACK(void)
-end_callback(png_structp png_ptr, png_infop info_ptr);
-
-  inline PRUint32 ProcessData(unsigned char *data, PRUint32 count);
-
-
-public:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-
-  png_structp mPNG;
-  png_infop mInfo;
-  PRUint8 *colorLine, *alphaLine;
-  PRUint8 *interlacebuf;
-  PRUint32 ibpr;
-};
-
-#endif // nsPNGDecoder_h__

mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp

@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsPNGDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "PNG decoder",
-    NS_PNGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/png",
-    nsPNGDecoderConstructor, },
-  { "PNG decoder",
-    NS_PNGDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/x-png",
-    nsPNGDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsPNGDecoderModule", components)
-

mozilla/modules/libpr0n/decoders/ppm/Makefile.in

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imgppm
-LIBRARY_NAME	= imgppm
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom layout necko gfx2 imglib2
-
-CPPSRCS		= nsPPMDecoder.cpp nsPPMFactory.cpp
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/decoders/ppm/makefile.win

@@ -1,51 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imgppm
-LIBRARY_NAME	= imgppm
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\nsPPMDecoder.obj \
-		.\$(OBJDIR)\nsPPMFactory.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.cpp

@@ -1,305 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- */
-
-#include "nsPPMDecoder.h"
-
-#include "nsIInputStream.h"
-#include "imgIContainer.h"
-#include "imgIContainerObserver.h"
-
-#include "nspr.h"
-
-#include "nsIComponentManager.h"
-
-#include "nsRect.h"
-
-NS_IMPL_ISUPPORTS2(nsPPMDecoder, imgIDecoder, nsIOutputStream)
-
-
-nsPPMDecoder::nsPPMDecoder()
-{
-  NS_INIT_ISUPPORTS();
-  mDataReceived = 0;
-  mDataWritten = 0;
-
-  mDataLeft = 0;
-  mPrevData = nsnull;
-}
-
-nsPPMDecoder::~nsPPMDecoder()
-{
-
-}
-
-
-/** imgIDecoder methods **/
-
-/* void init (in imgIRequest aRequest); */
-NS_IMETHODIMP nsPPMDecoder::Init(imgIRequest *aRequest)
-{
-  mRequest = aRequest;
-
-  mObserver = do_QueryInterface(aRequest);  // we're holding 2 strong refs to the request.
-
-  aRequest->GetImage(getter_AddRefs(mImage));
-
-  mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-  if (!mFrame)
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-}
-
-/* readonly attribute imgIRequest request; */
-NS_IMETHODIMP nsPPMDecoder::GetRequest(imgIRequest * *aRequest)
-{
-  *aRequest = mRequest;
-  NS_ADDREF(*aRequest);
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIOutputStream methods **/
-
-/* void close (); */
-NS_IMETHODIMP nsPPMDecoder::Close()
-{
-  if (mObserver) {
-    mObserver->OnStopFrame(nsnull, nsnull, mFrame);
-    mObserver->OnStopContainer(nsnull, nsnull, mImage);
-    mObserver->OnStopDecode(nsnull, nsnull, NS_OK, nsnull);
-  }
-  
-  return NS_OK;
-}
-
-/* void flush (); */
-NS_IMETHODIMP nsPPMDecoder::Flush()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* unsigned long write (in string buf, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-static char *__itoa(int n)
-{
-	char *s;
-	int i, j, sign, tmp;
-	
-	/* check sign and convert to positive to stringify numbers */
-	if ( (sign = n) < 0)
-		n = -n;
-	i = 0;
-	s = (char*) malloc(sizeof(char));
-	
-	/* grow string as needed to add numbers from powers of 10 
-     * down till none left 
-     */
-	do
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start */
-		s[i] = '\0';
-	}
-	while( (n /= 10) > 0);	
-	
-	/* tack on minus sign if we found earlier that this was negative */
-	if (sign < 0)
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = '-';
-	}
-	s[i] = '\0';
-	
-	/* pop numbers (and sign) off of string to push back into right direction */
-	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
-	{
-		tmp = s[i];
-		s[i] = s[j];
-		s[j] = tmp;
-	}
-	
-	return s;
-}
-
-
-/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval)
-{
-  nsresult rv;
-
-  char *buf = (char *)PR_Malloc(count + mDataLeft);
-  if (!buf)
-    return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */
-
-  
-  // read the data from the input stram...
-  PRUint32 readLen;
-  rv = inStr->Read(buf+mDataLeft, count, &readLen);
-
-  PRUint32 dataLen = readLen + mDataLeft;
-
-  if (mPrevData) {
-    strncpy(buf, mPrevData, mDataLeft);
-    PR_Free(mPrevData);
-    mPrevData = nsnull;
-    mDataLeft = 0;
-  }
-
-  char *data = buf;
-
-  if (NS_FAILED(rv)) return rv;
-
-  if (mDataReceived == 0) {
-
-    mObserver->OnStartDecode(nsnull, nsnull);
-
-    // Check the magic number
-    char type;
-    if ((sscanf(data, "P%c\n", &type) !=1) || (type != '6')) {
-      return NS_ERROR_FAILURE;
-    }
-    int i = 3;
-    data += i;
-
-#if 0
-    // XXX
-    // Ignore comments
-    while ((input = fgetc(f)) == '#')
-      fgets(junk, 512, f);
-    ungetc(input, f);
-#endif
-
-    // Read size
-    int w, h, mcv;
-
-    if (sscanf(data, "%d %d\n%d\n", &w, &h, &mcv) != 3) {
-      return NS_ERROR_FAILURE;
-    }
-    char *ws = __itoa(w), *hs = __itoa(h), *mcvs = __itoa(mcv);
-    int j = strlen(ws) + strlen(hs) + strlen(mcvs) + 3;
-    data += j;
-//    free(ws);
-//    free(hs);
-//    free(mcvs);
-
-    readLen -= i + j;
-    dataLen = readLen; // since this is the first pass, we don't have any data waiting that we need to keep track of
-
-    mImage->Init(w, h, mObserver);
-    if (mObserver)
-      mObserver->OnStartContainer(nsnull, nsnull, mImage);
-
-    mFrame->Init(0, 0, w, h, gfxIFormats::RGB);
-    mImage->AppendFrame(mFrame);
-    if (mObserver)
-      mObserver->OnStartFrame(nsnull, nsnull, mFrame);
-  }
-
-  PRUint32 bpr;
-  nscoord width;
-  mFrame->GetImageBytesPerRow(&bpr);
-  mFrame->GetWidth(&width);
-
-  // XXX ceil?
-  PRUint32 real_bpr = width * 3;
-  
-  PRUint32 i = 0;
-  PRUint32 rownum = mDataWritten / real_bpr;  // XXX this better not have a decimal
-  
-  PRUint32 wroteLen = 0;
-
-  if (readLen > real_bpr) {
-
-    do {
-      PRUint8 *line = (PRUint8*)data + i*real_bpr;
-      mFrame->SetImageData(line, real_bpr, (rownum++)*bpr);
-
-      nsRect r(0, rownum, width, 1);
-      mObserver->OnDataAvailable(nsnull, nsnull, mFrame, &r);
-
-
-      wroteLen += real_bpr ;
-      i++;
-    } while(dataLen >= real_bpr * (i+1));
-
-  }
-  
-  mDataReceived += readLen;  // don't double count previous data that is in 'dataLen'
-  mDataWritten += wroteLen;
-
-  PRUint32 dataLeft = dataLen - wroteLen;
-
-  if (dataLeft > 0) {
-    if (mPrevData) {
-      mPrevData = (char *)PR_Realloc(mPrevData, mDataLeft + dataLeft);
-      strncpy(mPrevData + mDataLeft, data+wroteLen, dataLeft);
-      mDataLeft += dataLeft;
-
-    } else {
-      mDataLeft = dataLeft;
-      mPrevData = (char *)PR_Malloc(mDataLeft);
-      strncpy(mPrevData, data+wroteLen, mDataLeft);
-    }
-  }
-
-  PR_FREEIF(buf);
-
-  return NS_OK;
-}
-
-/* [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count); */
-NS_IMETHODIMP nsPPMDecoder::WriteSegments(nsReadSegmentFun reader, void * closure, PRUint32 count, PRUint32 *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute boolean nonBlocking; */
-NS_IMETHODIMP nsPPMDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPPMDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsIOutputStreamObserver observer; */
-NS_IMETHODIMP nsPPMDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP nsPPMDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/modules/libpr0n/decoders/ppm/nsPPMDecoder.h

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsPPMDecoder_h__
-#define nsPPMDecoder_h__
-
-#include "imgIDecoder.h"
-
-#include "nsCOMPtr.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoderObserver.h"
-#include "gfxIImageFrame.h"
-#include "imgIRequest.h"
-
-#define NS_PPMDECODER_CID \
-{ /* e90bfa06-1dd1-11b2-8217-f38fe5d431a2 */         \
-     0xe90bfa06,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0x82, 0x17, 0xf3, 0x8f, 0xe5, 0xd4, 0x31, 0xa2} \
-}
-
-class nsPPMDecoder : public imgIDecoder
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
-
-  nsPPMDecoder();
-  virtual ~nsPPMDecoder();
-
-private:
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<gfxIImageFrame> mFrame;
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<imgIDecoderObserver> mObserver; // this is just qi'd from mRequest for speed
-
-  PRUint32 mDataReceived;
-  PRUint32 mDataWritten;
-
-  PRUint32 mDataLeft;
-  char *mPrevData;
-};
-
-#endif // nsPPMDecoder_h__

mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsPPMDecoder.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder)
-
-static nsModuleComponentInfo components[] =
-{
-  { "ppm decoder",
-    NS_PPMDECODER_CID,
-    "@mozilla.org/image/decoder;2?type=image/x-portable-pixmap",
-    nsPPMDecoderConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsPPMDecoderModule", components)
-

mozilla/modules/libpr0n/makefile.win

@@ -1,25 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\.. 
-
-DIRS = public src decoders
-
-!include $(DEPTH)\config\rules.mak

mozilla/modules/libpr0n/public/ImageLogging.h

@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "prlog.h"
-
-#include "nsString.h"
-
-#if defined(PR_LOGGING)
-extern PRLogModuleInfo *gImgLog;
-
-class LogScope {
-public:
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {ENTER}\n",
-                                   mFrom, mFunc.get()));
-  }
-
-  /* const char * constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, const char *paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%s\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* void ptr constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, const void *paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=%p) {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* PRInt32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, PRInt32 paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-  /* PRUint32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
-           const nsLiteralCString &paramName, PRUint32 paramValue) :
-    mLog(aLog), mFrom(from), mFunc(fn)
-  {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s (%s=\"%d\") {ENTER}\n",
-                                   mFrom, mFunc.get(),
-                                   paramName.get(),
-                                   paramValue));
-  }
-
-
-  ~LogScope() {
-    PR_LOG(mLog, PR_LOG_DEBUG, ("[this=%p] %s {EXIT}\n",
-                                   mFrom, mFunc.get()));
-  }
-
-private:
-  PRLogModuleInfo *mLog;
-  void *mFrom;
-  nsCAutoString mFunc;
-};
-
-
-#define LOG_SCOPE(l, s) \
-  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
-                                         NS_LITERAL_CSTRING(s))
-
-#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv) \
-  LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
-                                         NS_LITERAL_CSTRING(s),        \
-                                         NS_LITERAL_CSTRING(pn), pv)
-
-#else
-#define LOG_SCOPE(l, s)
-#define LOG_SCOPE_WITH_PARAM(l, s, pn, pv)
-#endif

mozilla/modules/libpr0n/public/MANIFEST

@@ -1 +0,0 @@
-ImageLogging.h 

mozilla/modules/libpr0n/public/MANIFEST_IDL

@@ -1,6 +0,0 @@
-imgIContainer.idl
-imgIContainerObserver.idl
-imgIDecoder.idl
-imgIDecoderObserver.idl
-imgILoader.idl
-imgIRequest.idl

mozilla/modules/libpr0n/public/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imglib2
-
-EXPORTS		= ImageLogging.h
-
-XPIDLSRCS	= imgIContainer.idl         \
-						imgIContainerObserver.idl \
-						imgIDecoder.idl           \
-						imgIDecoderObserver.idl	  \
-						imgILoader.idl            \
-						imgIRequest.idl
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/public/imgIContainer.idl

@@ -1,109 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-#include "gfxIFormats.idl"
-
-interface gfxIImageFrame;
-interface nsIEnumerator;
-interface imgIContainerObserver;
-
-/**
- * gfxIImageContainer interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see "gfx2"
- */
-[scriptable, uuid(5e8405a4-1dd2-11b2-8385-bc8e3446cad3)]
-interface imgIContainer : nsISupports
-{
-  /**
-   * Create a new \a aWidth x \a aHeight sized image container.
-   *
-   * @param aWidth The width of the container in which all the
-   *               gfxIImageFrame children will fit.
-   * @param aHeight The height of the container in which all the
-   *                gfxIImageFrame children will fit.
-   * @param aObserver Observer to send animation notifications to.
-   */
-  void init(in nscoord aWidth,
-            in nscoord aHeight,
-            in imgIContainerObserver aObserver);
-
-
-  /* this should probably be on the device context (or equiv) */
-  readonly attribute gfx_format preferredAlphaChannelFormat;
-
-  /**
-   * The width of the container rectangle.
-   */
-  readonly attribute nscoord width;
-
-  /**
-   * The height of the container rectangle.
-   */
-  readonly attribute nscoord height;
-
-
-  /**
-   * Get the current frame that would be drawn if the image was to be drawn now
-   */
-  readonly attribute gfxIImageFrame currentFrame;
-
-
-  readonly attribute unsigned long numFrames;
-
-  gfxIImageFrame getFrameAt(in unsigned long index);
-
-  /**
-   * Adds \a item to the end of the list of frames.
-   * @param item frame to add.
-   */
-  void appendFrame(in gfxIImageFrame item);
-
-  void removeFrame(in gfxIImageFrame item);
-
-  /* notification when the current frame is done decoding */
-  void endFrameDecode(in unsigned long framenumber, in unsigned long timeout);
-  
-  /* notification that the entire image has been decoded */
-  void decodingComplete();
-  
-  nsIEnumerator enumerate();
-
-  void clear();
-
-  void startAnimation();
-
-  void stopAnimation();
-
-  /* animation stuff */
-
-  /**
-   * number of times to loop the image.
-   * @note -1 means forever.
-   */
-  attribute long loopCount;
-};

mozilla/modules/libpr0n/public/imgIContainerObserver.idl

@@ -1,46 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-
-%{C++
-#include "nsRect.h"
-%}
-
-interface imgIContainer;
-
-interface gfxIImageFrame;
-
-/**
- * imgIContainerObserver interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- */
-[uuid(153f1518-1dd2-11b2-b9cd-b16eb63e0471)]
-interface imgIContainerObserver : nsISupports
-{
-  [noscript] void frameChanged(in imgIContainer aContainer, in nsISupports aCX,
-                               in gfxIImageFrame aFrame, in nsRect aDirtyRect);
-};

mozilla/modules/libpr0n/public/imgIDecoder.idl

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsIOutputStream.idl"
-#include "gfxtypes.idl"
-
-interface imgIRequest;
-
-/**
- * imgIDecoder interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(9eebf43a-1dd1-11b2-953e-f1782f4cbad3)]
-interface imgIDecoder : nsIOutputStream
-{
-  /**
-   * Initalize an image decoder.
-   * @param aRequest the request that owns the decoder.
-   *
-   * @note The decode should QI \a aRequest to an imgIDecoderObserver
-   * and should send decoder notifications to the request.
-   * The decoder should always pass NULL as the first two parameters to
-   * all of the imgIDecoderObserver APIs.
-   */
-  void init(in imgIRequest aRequest);
-
-  /// allows access to the nsIImage we have to put bits in to.
-  readonly attribute imgIRequest request;
-};

mozilla/modules/libpr0n/public/imgIDecoderObserver.idl

@@ -1,80 +0,0 @@
-/** -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgIContainerObserver.idl"
-
-interface imgIRequest;
-interface imgIContainer;
-interface gfxIImageFrame;
-
-%{C++
-#include "nsRect.h"
-%}
-
-/**
- * imgIDecoderObserver interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(350163d2-1dd2-11b2-9e69-89959ecec1f3)]
-interface imgIDecoderObserver : imgIContainerObserver
-{
-  /**
-   * called as soon as the image begins getting decoded
-   */
-  void onStartDecode(in imgIRequest aRequest, in nsISupports cx);
-
-  /**
-   * called once the image has been inited and therefore has a width and height
-   */
-  void onStartContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
-
-  /**
-   * called when each frame is created
-   */
-  void onStartFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
-
-  /**
-   * called when some part of the frame has new data in it
-   */
-  [noscript] void onDataAvailable(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame, [const] in nsRect aRect);
-
-  /**
-   * called when a frame is finished decoding
-   */
-  void onStopFrame(in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame);
-
-  /**
-   * probably not needed.  called right before onStopDecode
-   */
-  void onStopContainer(in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer);
-
-  /**
-   * called when the decoder is dying off
-   */
-  void onStopDecode(in imgIRequest aRequest, in nsISupports cx,
-                    in nsresult status, in wstring statusArg);
-
-};

mozilla/modules/libpr0n/public/imgILoader.idl

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "gfxtypes.idl"
-
-interface imgIDecoderObserver;
-interface imgIRequest;
-
-interface nsIChannel;
-interface nsILoadGroup;
-interface nsIStreamListener;
-interface nsIURI;
-
-interface nsISimpleEnumerator;
-
-/**
- * imgILoader interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(4c8cf1e0-1dd2-11b2-aff9-c51cdbfcb6da)]
-interface imgILoader : nsISupports
-{
-  /**
-   * Start the load and decode of an image.
-   * @param uri the URI to load
-   * @param aObserver the observer
-   * @param cx some random data
-   */
-  imgIRequest loadImage(in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx);
-
-  /**
-   * Start the load and decode of an image.
-   * @param uri the URI to load
-   * @param aObserver the observer
-   * @param cx some random data
-   */
-  imgIRequest loadImageWithChannel(in nsIChannel aChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener aListener);
-};

mozilla/modules/libpr0n/public/imgIRequest.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-#include "nsIRequest.idl"
-
-interface imgIContainer;
-interface imgIDecoderObserver;
-interface nsIURI;
-
-/**
- * imgIRequest interface
- *
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.1
- * @see imagelib2
- */
-[scriptable, uuid(ccf705f6-1dd1-11b2-82ef-e18eccf7f7ec)]
-interface imgIRequest : nsIRequest
-{
-  /**
-   * the image container...
-   * @return the image object associated with the request.
-   * @attention NEED DOCS
-   */
-  readonly attribute imgIContainer image;
-
-  /**
-   * Bits set in the return value from imageStatus
-   * @name statusflags
-   */
-  //@{
-  const long STATUS_NONE             = 0x0;
-  const long STATUS_SIZE_AVAILABLE   = 0x1;
-  const long STATUS_LOAD_COMPLETE    = 0x2;
-  const long STATUS_ERROR            = 0x4;
-  //@}
-
-  /**
-   * something
-   * @attention NEED DOCS
-   */
-  readonly attribute unsigned long imageStatus;
-
-  readonly attribute nsIURI URI;
-
-  readonly attribute imgIDecoderObserver decoderObserver;
-};
-
-%{C++
-
-/**
- * imagelib specific nsresult success and error codes
- */
-#define NS_IMAGELIB_SUCCESS_LOAD_FINISHED   NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 0)
-
-#define NS_IMAGELIB_ERROR_FAILURE           NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 5)
-#define NS_IMAGELIB_ERROR_NO_DECODER        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 6)
-
-%}

mozilla/modules/libpr0n/public/makefile.win

@@ -1,43 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH		= ..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE		= imglib2
-XPIDL_MODULE	= imglib2
-
-EXPORTS		= ImageLogging.h
-
-XPIDLSRCS	= \
-		.\imgIContainer.idl \
-		.\imgIContainerObserver.idl \
-		.\imgIDecoder.idl \
-		.\imgIDecoderObserver.idl \
-		.\imgILoader.idl \
-		.\imgIRequest.idl \
-		$(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/modules/libpr0n/src/DummyChannel.cpp

@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "DummyChannel.h"
-
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-
-
-NS_IMPL_ISUPPORTS1(DummyChannel, nsIChannel)
-
-DummyChannel::DummyChannel(imgIRequest *aRequest, nsILoadGroup *aLoadGroup) :
-  mRequest(aRequest),
-  mLoadGroup(aLoadGroup),
-  mLoadFlags(nsIChannel::LOAD_NORMAL)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-DummyChannel::~DummyChannel()
-{
-  /* destructor code */
-}
-
-/* attribute nsIURI originalURI; */
-NS_IMETHODIMP DummyChannel::GetOriginalURI(nsIURI * *aOriginalURI)
-{
-  return mRequest->GetURI(aOriginalURI);
-}
-NS_IMETHODIMP DummyChannel::SetOriginalURI(nsIURI * aOriginalURI)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsIURI URI; */
-NS_IMETHODIMP DummyChannel::GetURI(nsIURI * *aURI)
-{
-  return mRequest->GetURI(aURI);
-}
-NS_IMETHODIMP DummyChannel::SetURI(nsIURI * aURI)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsISupports owner; */
-NS_IMETHODIMP DummyChannel::GetOwner(nsISupports * *aOwner)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetOwner(nsISupports * aOwner)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute nsILoadGroup loadGroup; */
-NS_IMETHODIMP DummyChannel::GetLoadGroup(nsILoadGroup * *aLoadGroup)
-{
-  *aLoadGroup = mLoadGroup;
-  NS_IF_ADDREF(*aLoadGroup);
-  return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetLoadGroup(nsILoadGroup * aLoadGroup)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* attribute nsLoadFlags loadAttributes; */
-NS_IMETHODIMP DummyChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-  *aLoadAttributes = mLoadFlags;
-  return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-  mLoadFlags = aLoadAttributes;
-  return NS_OK;
-}
-
-/* attribute nsIInterfaceRequestor notificationCallbacks; */
-NS_IMETHODIMP DummyChannel::GetNotificationCallbacks(nsIInterfaceRequestor * *aNotificationCallbacks)
-{
-    return NS_OK;
-}
-NS_IMETHODIMP DummyChannel::SetNotificationCallbacks(nsIInterfaceRequestor * aNotificationCallbacks)
-{
-    return NS_OK;
-}
-
-/* readonly attribute nsISupports securityInfo; */
-NS_IMETHODIMP DummyChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute string contentType; */
-NS_IMETHODIMP DummyChannel::GetContentType(char * *aContentType)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetContentType(const char * aContentType)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* attribute long contentLength; */
-NS_IMETHODIMP DummyChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP DummyChannel::SetContentLength(PRInt32 aContentLength)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* nsIInputStream open (); */
-NS_IMETHODIMP DummyChannel::Open(nsIInputStream **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void asyncOpen (in nsIStreamListener listener, in nsISupports ctxt); */
-NS_IMETHODIMP DummyChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctxt)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/modules/libpr0n/src/DummyChannel.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef DummyChannel_h__
-#define DummyChannel_h__
-
-#include "nsIChannel.h"
-#include "nsIRequest.h"
-#include "nsILoadGroup.h"
-
-#include "imgIRequest.h"
-
-#include "nsCOMPtr.h"
-
-class DummyChannel : public nsIChannel
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSICHANNEL
-  NS_FORWARD_NSIREQUEST(mRequest->)
-
-  DummyChannel(imgIRequest *aRequest, nsILoadGroup *aLoadGroup);
-  ~DummyChannel();
-
-private:
-  /* additional members */
-  nsCOMPtr<imgIRequest> mRequest;
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-
-  nsLoadFlags mLoadFlags;
-};
-
-#endif
-

mozilla/modules/libpr0n/src/ImageCache.cpp

@@ -1,166 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "ImageCache.h"
-
-#ifdef MOZ_NEW_CACHE
-
-#include "prlog.h"
-
-#if defined(PR_LOGGING)
-extern PRLogModuleInfo *gImgLog;
-#else
-#define gImgLog
-#endif
-
-#include "nsXPIDLString.h"
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-
-#include "nsICache.h"
-#include "nsICacheService.h"
-#include "nsICacheSession.h"
-#include "nsICacheEntryDescriptor.h"
-
-static nsCOMPtr<nsICacheSession> gSession = nsnull;
-
-ImageCache::ImageCache()
-{
-  /* member initializers and constructor code */
-}
-
-ImageCache::~ImageCache()
-{
-  /* destructor code */
-}
-
-void GetCacheSession(nsICacheSession **_retval)
-{
-  if (!gSession) {
-    nsCOMPtr<nsICacheService> cacheService(do_GetService("@mozilla.org/network/cache-service;1"));
-    NS_ASSERTION(cacheService, "Unable to get the cache service");
-
-    cacheService->CreateSession("images", nsICache::NOT_STREAM_BASED, PR_FALSE, getter_AddRefs(gSession));
-    NS_ASSERTION(gSession, "Unable to create a cache session");
-  }
-
-  *_retval = gSession;
-  NS_IF_ADDREF(*_retval);
-}
-
-
-void ImageCache::Shutdown()
-{
-  gSession = nsnull;
-}
-
-PRBool ImageCache::Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("ImageCache::Put\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_WRITE, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  entry->SetCacheElement(NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(imgIRequest*, request)));
-
-  entry->MarkValid();
-
-  *aEntry = entry;
-  NS_ADDREF(*aEntry);
-
-  return PR_TRUE;
-}
-
-PRBool ImageCache::Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-       ("ImageCache::Get\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_READ, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  nsCOMPtr<nsISupports> sup;
-  entry->GetCacheElement(getter_AddRefs(sup));
-
-  nsCOMPtr<imgIRequest> req(do_QueryInterface(sup));
-  *aRequest = NS_REINTERPRET_CAST(imgRequest*, req.get());
-  NS_IF_ADDREF(*aRequest);
-
-  *aEntry = entry;
-  NS_ADDREF(*aEntry);
-
-  return PR_TRUE;
-}
-
-
-PRBool ImageCache::Remove(nsIURI *aKey)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("ImageCache::Remove\n"));
-
-  nsresult rv;
-
-  nsCOMPtr<nsICacheSession> ses;
-  GetCacheSession(getter_AddRefs(ses));
-
-  nsXPIDLCString spec;
-  aKey->GetSpec(getter_Copies(spec));
-
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-
-  rv = ses->OpenCacheEntry(spec, nsICache::ACCESS_READ, getter_AddRefs(entry));
-
-  if (!entry || NS_FAILED(rv))
-    return PR_FALSE;
-
-  entry->Doom();
-
-  return PR_TRUE;
-}
-
-#endif /* MOZ_NEW_CACHE */

mozilla/modules/libpr0n/src/ImageCache.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef ImageCache_h__
-#define ImageCache_h__
-
-#include "nsIURI.h"
-#include "imgRequest.h"
-#include "prtypes.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICacheEntryDescriptor.h"
-#else
-class nsICacheEntryDescriptor;
-#endif
-
-
-class ImageCache
-{
-public:
-#ifdef MOZ_NEW_CACHE
-  ImageCache();
-  ~ImageCache();
-
-  static void Shutdown(); // for use by the factory
-
-  /* additional members */
-  static PRBool Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry);
-  static PRBool Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry);
-  static PRBool Remove(nsIURI *aKey);
-
-#else
-
-  ImageCache()  { }
-  ~ImageCache() { }
-
-  static void Shutdown() { }
-
-  /* additional members */
-  static PRBool Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor **aEntry) {
-    return PR_FALSE;
-  }
-  static PRBool Get(nsIURI *aKey, imgRequest **aRequest, nsICacheEntryDescriptor **aEntry) {
-    return PR_FALSE;
-  }
-  static PRBool Remove(nsIURI *aKey) {
-    return PR_FALSE;
-  }
-#endif /* MOZ_NEW_CACHE */
-};
-
-#endif

mozilla/modules/libpr0n/src/ImageFactory.cpp

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "imgContainer.h"
-#include "imgLoader.h"
-#include "imgRequest.h"
-#include "imgRequestProxy.h"
-
-#include "ImageCache.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainer)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgLoader)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequest)
-NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequestProxy)
-
-static nsModuleComponentInfo components[] =
-{
-  { "image container",
-    NS_IMGCONTAINER_CID,
-    "@mozilla.org/image/container;1",
-    imgContainerConstructor, },
-  { "image loader",
-    NS_IMGLOADER_CID,
-    "@mozilla.org/image/loader;1",
-    imgLoaderConstructor, },
-  { "image request",
-    NS_IMGREQUEST_CID,
-    "@mozilla.org/image/request/real;1",
-    imgRequestConstructor, },
-  { "image request proxy",
-    NS_IMGREQUESTPROXY_CID,
-    "@mozilla.org/image/request/proxy;1",
-    imgRequestProxyConstructor, },
-};
-
-PR_STATIC_CALLBACK(void)
-ImageModuleDestructor(nsIModule *self)
-{
-  ImageCache::Shutdown();
-}
-
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsImageLib2Module", components, ImageModuleDestructor)

mozilla/modules/libpr0n/src/Makefile.in

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= imglib2
-LIBRARY_NAME	= imglib2
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom string necko nkcache layout timer gfx2
-
-CPPSRCS		= \
-			DummyChannel.cpp \
-			ImageCache.cpp   \
-			ImageFactory.cpp \
-			imgContainer.cpp \
-			imgLoader.cpp    \
-			imgRequest.cpp   \
-			imgRequestProxy.cpp
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/modules/libpr0n/src/imgContainer.cpp

@@ -1,555 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Chris Saari <saari@netscape.com>
- */
-
-#include "imgContainer.h"
-
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "gfxIImageFrame.h"
-#include "nsIImage.h"
-
-NS_IMPL_ISUPPORTS3(imgContainer, imgIContainer, nsITimerCallback,imgIDecoderObserver)
-
-//******************************************************************************
-imgContainer::imgContainer()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-  mCurrentDecodingFrameIndex = 0;
-  mCurrentAnimationFrameIndex = 0;
-  mCurrentFrameIsFinishedDecoding = PR_FALSE;
-  mDoneDecoding = PR_FALSE;
-  mAnimating = PR_FALSE;
-  mObserver = nsnull;
-}
-
-//******************************************************************************
-imgContainer::~imgContainer()
-{
-  if (mTimer)
-    mTimer->Cancel();
-    
-  /* destructor code */
-  mFrames.Clear();
-}
-
-//******************************************************************************
-/* void init (in nscoord aWidth, in nscoord aHeight, in imgIContainerObserver aObserver); */
-NS_IMETHODIMP imgContainer::Init(nscoord aWidth, nscoord aHeight, imgIContainerObserver *aObserver)
-{
-  if (aWidth <= 0 || aHeight <= 0) {
-    NS_WARNING("error - negative image size\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  mSize.SizeTo(aWidth, aHeight);
-
-  mObserver = getter_AddRefs(NS_GetWeakReference(aObserver));
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute gfx_format preferredAlphaChannelFormat; */
-NS_IMETHODIMP imgContainer::GetPreferredAlphaChannelFormat(gfx_format *aFormat)
-{
-  /* default.. platform's should probably overwrite this */
-  *aFormat = gfxIFormats::RGB_A8;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute nscoord width; */
-NS_IMETHODIMP imgContainer::GetWidth(nscoord *aWidth)
-{
-  *aWidth = mSize.width;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute nscoord height; */
-NS_IMETHODIMP imgContainer::GetHeight(nscoord *aHeight)
-{
-  *aHeight = mSize.height;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* readonly attribute gfxIImageFrame currentFrame; */
-NS_IMETHODIMP imgContainer::GetCurrentFrame(gfxIImageFrame * *aCurrentFrame)
-{
-  if(mCompositingFrame)
-    return mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aCurrentFrame); // addrefs again
-  else
-    return this->GetFrameAt(mCurrentAnimationFrameIndex, aCurrentFrame);
-}
-
-//******************************************************************************
-/* readonly attribute unsigned long numFrames; */
-NS_IMETHODIMP imgContainer::GetNumFrames(PRUint32 *aNumFrames)
-{
-  return mFrames.Count(aNumFrames);
-}
-
-//******************************************************************************
-/* gfxIImageFrame getFrameAt (in unsigned long index); */
-NS_IMETHODIMP imgContainer::GetFrameAt(PRUint32 index, gfxIImageFrame **_retval)
-{
-  nsISupports *sup = mFrames.ElementAt(index); // addrefs
-  if (!sup)
-    return NS_ERROR_FAILURE;
-
-  nsresult rv;
-  rv = sup->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)_retval); // addrefs again
-
-  NS_RELEASE(sup);
-
-  return rv;
-}
-
-//******************************************************************************
-/* void appendFrame (in gfxIImageFrame item); */
-NS_IMETHODIMP imgContainer::AppendFrame(gfxIImageFrame *item)
-{
-  // If we don't have a composite frame already allocated, make sure that our container
-  // size is the same the frame size. Otherwise, we'll either need the composite frame
-  // for animation compositing (GIF) or for filling in with a background color.
-  // XXX IMPORTANT: this means that the frame should be initialized BEFORE appending to container
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-  
-  if(!mCompositingFrame) {
-    nsRect frameRect;
-    item->GetRect(frameRect);
-    // We used to create a compositing frame if any frame was smaller than the logical
-    // image size. You could create a single frame that was 10x10 in the middle of
-    // an 20x20 logical screen and have the extra screen space filled by the image 
-    // background color. However, it turns out that neither NS4.x nor IE correctly
-    // support this, and as a result there are many GIFs out there that look "wrong"
-    // when this is correctly supported. So for now, we only create a compositing frame
-    // if we have more than one frame in the image.
-    if(/*(frameRect.x != 0) ||
-       (frameRect.y != 0) ||
-       (frameRect.width != mSize.width) ||
-       (frameRect.height != mSize.height) ||*/
-       (numFrames >= 1)) // Not sure if I want to create a composite frame for every anim. Could be smarter.
-    {
-      mCompositingFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-      mCompositingFrame->Init(0, 0, mSize.width, mSize.height, gfxIFormats::RGB); 
-      nsCOMPtr<nsIImage> img(do_GetInterface(mCompositingFrame));
-      img->SetDecodedRect(0, 0, mSize.width, mSize.height);
-      
-      nsCOMPtr<gfxIImageFrame> firstFrame;
-      this->GetFrameAt(0, getter_AddRefs(firstFrame));
-      firstFrame->DrawTo(mCompositingFrame, 0, 0, mSize.width, mSize.height);
-    }
-  }
-  // If this is our second frame, init a timer so we don't display
-  // the next frame until the delay timer has expired for the current
-  // frame.
-
-  if (!mTimer && (numFrames >= 1)) {
-      PRInt32 timeout;
-      nsCOMPtr<gfxIImageFrame> currentFrame;
-      this->GetFrameAt(mCurrentDecodingFrameIndex, getter_AddRefs(currentFrame));
-      currentFrame->GetTimeout(&timeout);
-      if (timeout != -1 &&
-         timeout >= 0) { // -1 means display this frame forever
-        
-        if(mAnimating) {
-          // Since we have more than one frame we need a timer
-          mTimer = do_CreateInstance("@mozilla.org/timer;1");
-          mTimer->Init(
-            NS_STATIC_CAST(nsITimerCallback*, this), 
-            timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-        }
-      }
-  }
- 
-  if (numFrames > 0) mCurrentDecodingFrameIndex++;
-
-  mCurrentFrameIsFinishedDecoding = PR_FALSE;
-
-  return mFrames.AppendElement(NS_STATIC_CAST(nsISupports*, item));
-}
-
-//******************************************************************************
-/* void removeFrame (in gfxIImageFrame item); */
-NS_IMETHODIMP imgContainer::RemoveFrame(gfxIImageFrame *item)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void endFrameDecode (in gfxIImageFrame item, in unsigned long timeout); */
-NS_IMETHODIMP imgContainer::EndFrameDecode(PRUint32 aFrameNum, PRUint32 aTimeout)
-{
-  // It is now okay to start the timer for the next frame in the animation
-  mCurrentFrameIsFinishedDecoding = PR_TRUE;
-
-  nsCOMPtr<gfxIImageFrame> currentFrame;
-  this->GetFrameAt(aFrameNum-1, getter_AddRefs(currentFrame));
-  currentFrame->SetTimeout(aTimeout);
-      
-  if (!mTimer && mAnimating){
-    PRUint32 numFrames;
-    this->GetNumFrames(&numFrames);
-    if (numFrames > 1) {
-        if (aTimeout != -1 &&
-            aTimeout >= 0) { // -1 means display this frame forever
-
-          mAnimating = PR_TRUE;
-          mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-          mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                     aTimeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-        }
-    }
-  }
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void decodingComplete (); */
-NS_IMETHODIMP imgContainer::DecodingComplete(void)
-{
-  mDoneDecoding = PR_TRUE;
-  return NS_OK;
-}
-
-//******************************************************************************
-/* nsIEnumerator enumerate (); */
-NS_IMETHODIMP imgContainer::Enumerate(nsIEnumerator **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void clear (); */
-NS_IMETHODIMP imgContainer::Clear()
-{
-  return mFrames.Clear();
-}
-
-//******************************************************************************
-/* void startAnimation () */
-NS_IMETHODIMP imgContainer::StartAnimation()
-{
-  mAnimating = PR_TRUE;
-        
-  if (mTimer)
-    return NS_OK;
-
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-
-  if (numFrames > 1) {
-    PRInt32 timeout;
-    nsCOMPtr<gfxIImageFrame> currentFrame;
-    this->GetCurrentFrame(getter_AddRefs(currentFrame));
-    if (currentFrame) {
-      currentFrame->GetTimeout(&timeout);
-      if (timeout != -1 &&
-          timeout >= 0) { // -1 means display this frame forever
-
-        mAnimating = PR_TRUE;
-        if(!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-        mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                     timeout, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-      }
-    } else {
-      // XXX hack.. the timer notify code will do the right thing, so just get that started
-      mAnimating = PR_TRUE;
-      if(!mTimer) mTimer = do_CreateInstance("@mozilla.org/timer;1");
-      
-      mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
-                   100, NS_PRIORITY_NORMAL, NS_TYPE_REPEATING_SLACK);
-    }
-  }
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* void stopAnimation (); */
-NS_IMETHODIMP imgContainer::StopAnimation()
-{
-  mAnimating = PR_FALSE;
-  
-  if (!mTimer)
-    return NS_OK;
-
-  mTimer->Cancel();
-  
-  mTimer = nsnull;
-
-  // don't bother trying to change the frame (to 0, etc.) here.
-  // No one is listening.
-
-  return NS_OK;
-}
-
-//******************************************************************************
-/* attribute long loopCount; */
-NS_IMETHODIMP imgContainer::GetLoopCount(PRInt32 *aLoopCount)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP imgContainer::SetLoopCount(PRInt32 aLoopCount)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-
-NS_IMETHODIMP_(void) imgContainer::Notify(nsITimer *timer)
-{
-  NS_ASSERTION(mTimer == timer, "uh");
-
-  if(!mAnimating || !mTimer)
-    return;
-
-  nsCOMPtr<imgIContainerObserver> observer(do_QueryReferent(mObserver));
-  if (!observer) {
-    // the imgRequest that owns us is dead, we should die now too.
-    this->StopAnimation();
-    return;
-  }
-
-  nsCOMPtr<gfxIImageFrame> nextFrame;
-  PRInt32 timeout = 100;
-  PRUint32 numFrames;
-  GetNumFrames(&numFrames);
-  if(!numFrames)
-    return;
-  
-  // If we're done decoding the next frame, go ahead and display it now and reinit
-  // the timer with the next frame's delay time.
-  PRUint32 previousAnimationFrameIndex = mCurrentAnimationFrameIndex;
-  if (mCurrentFrameIsFinishedDecoding && !mDoneDecoding) {
-    // If we have the next frame in the sequence set the timer callback from it
-    GetFrameAt(mCurrentAnimationFrameIndex+1, getter_AddRefs(nextFrame));
-    if (nextFrame) {
-      // Go to next frame in sequence
-      nextFrame->GetTimeout(&timeout);
-      mCurrentAnimationFrameIndex++;
-    } else {
-      // twiddle our thumbs
-      GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      nextFrame->GetTimeout(&timeout);
-    }
-  } else if (mDoneDecoding){
-    if ((numFrames-1) == mCurrentAnimationFrameIndex) {
-      // Go back to the beginning of the animation
-      GetFrameAt(0, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      mCurrentAnimationFrameIndex = 0;
-      nextFrame->GetTimeout(&timeout);
-    } else {
-      mCurrentAnimationFrameIndex++;
-      GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-      if(!nextFrame) return;
-      
-      nextFrame->GetTimeout(&timeout);
-    }
-  } else {
-    GetFrameAt(mCurrentAnimationFrameIndex, getter_AddRefs(nextFrame));
-    if(!nextFrame) return;
-  }
-
-  if(timeout >= 0)
-    mTimer->SetDelay(timeout);
-  else
-    this->StopAnimation();
-    
-    
-  nsRect dirtyRect;
-
-  // update the composited frame
-  if(mCompositingFrame && (previousAnimationFrameIndex != mCurrentAnimationFrameIndex)) {
-    nsCOMPtr<gfxIImageFrame> frameToUse;
-    DoComposite(getter_AddRefs(frameToUse), &dirtyRect, previousAnimationFrameIndex, mCurrentAnimationFrameIndex);
-
-    // do notification to FE to draw this frame, but hand it the compositing frame
-    observer->FrameChanged(this, nsnull, mCompositingFrame, &dirtyRect);
-  } 
-  else {
-    nextFrame->GetRect(dirtyRect);
-
-    // do notification to FE to draw this frame
-    observer->FrameChanged(this, nsnull, nextFrame, &dirtyRect);
-  }
-
-
-}
-//******************************************************************************
-// DoComposite gets called when the timer for animation get fired and we have to
-// update the composited frame of the animation.
-void imgContainer::DoComposite(gfxIImageFrame** aFrameToUse, nsRect* aDirtyRect, PRInt32 aPrevFrame, PRInt32 aNextFrame)
-{
-  NS_ASSERTION(aDirtyRect, "DoComposite aDirtyRect is null");
-  NS_ASSERTION(mCompositingFrame, "DoComposite mCompositingFrame is null");
-  
-  *aFrameToUse = nsnull;
-  
-  PRUint32 numFrames;
-  this->GetNumFrames(&numFrames);
-  PRInt32 nextFrameIndex = aNextFrame;
-  PRInt32 prevFrameIndex = aPrevFrame;
-  
-  if(nextFrameIndex >= numFrames) nextFrameIndex = numFrames-1;
-  if(prevFrameIndex >= numFrames) prevFrameIndex = numFrames-1;
-  
-  nsCOMPtr<gfxIImageFrame> prevFrame;
-  this->GetFrameAt(prevFrameIndex, getter_AddRefs(prevFrame));
-  PRInt32 prevFrameDisposalMethod;
-  prevFrame->GetFrameDisposalMethod(&prevFrameDisposalMethod);
-  
-  nsCOMPtr<gfxIImageFrame> nextFrame;
-  this->GetFrameAt(nextFrameIndex, getter_AddRefs(nextFrame));
-  
-  PRInt32 x;
-  PRInt32 y;
-  PRInt32 width;
-  PRInt32 height;
-  nextFrame->GetX(&x);
-  nextFrame->GetY(&y);
-  nextFrame->GetWidth(&width);
-  nextFrame->GetHeight(&height);
-  
-  switch (prevFrameDisposalMethod) {
-    default:
-    case 0: // DISPOSE_NOT_SPECIFIED
-    case 1: // DISPOSE_KEEP Leave previous frame in the framebuffer
-      mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aFrameToUse); // addrefs again
-      //XXX blit into the composite frame too!!!
-      nextFrame->DrawTo(mCompositingFrame, x, y, width, height);
-          
-      // we're drawing only the updated frame
-      (*aDirtyRect).x = x;
-      (*aDirtyRect).y = y;
-      (*aDirtyRect).width = width;
-      (*aDirtyRect).height = height;
-    break;
-    
-    case 2: // DISPOSE_OVERWRITE_BGCOLOR Overwrite with background color
-      //XXX overwrite mCompositeFrame with background color
-      gfx_color backgroundColor;
-      nextFrame->GetBackgroundColor(&backgroundColor);
-      //XXX Do background color overwrite of mCompositeFrame here
-      
-      // blit next frame into this clean slate
-      nextFrame->DrawTo(mCompositingFrame, x, y, width, height);
-      
-      // In this case we need to blit the whole composite frame  
-      (*aDirtyRect).x = 0;
-      (*aDirtyRect).y = 0;
-      (*aDirtyRect).width = mSize.width;
-      (*aDirtyRect).height = mSize.height;
-      mCompositingFrame->QueryInterface(NS_GET_IID(gfxIImageFrame), (void**)aFrameToUse); // addrefs again
-    break;
-    
-    case 4: // DISPOSE_OVERWRITE_PREVIOUS Save-under
-      //XXX Reblit previous composite into frame buffer
-      // 
-      (*aDirtyRect).x = 0;
-      (*aDirtyRect).y = 0;
-      (*aDirtyRect).width = mSize.width;
-      (*aDirtyRect).height = mSize.height;
-    break;
-  }
-  
-  // Get the next frame's disposal method, if it is it DISPOSE_OVER, save off
-  // this mCompositeFrame for reblitting when this timer gets fired again and
-  // we 
-  PRInt32 nextFrameDisposalMethod;
-  nextFrame->GetFrameDisposalMethod(&nextFrameDisposalMethod);
-  //XXX if(nextFrameDisposalMethod == 4)
-  // blit mPreviousCompositeFrame with this frame
-}
-//******************************************************************************
-/* void onStartDecode (in imgIRequest aRequest, in nsISupports cx); */
-NS_IMETHODIMP imgContainer::OnStartDecode(imgIRequest *aRequest, nsISupports *cx)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStartContainer (in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer); */
-NS_IMETHODIMP imgContainer::OnStartContainer(imgIRequest *aRequest, nsISupports *cx, imgIContainer *aContainer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStartFrame (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame); */
-NS_IMETHODIMP imgContainer::OnStartFrame(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* [noscript] void onDataAvailable (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame, [const] in nsRect aRect); */
-NS_IMETHODIMP imgContainer::OnDataAvailable(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame, const nsRect * aRect)
-{
-  if(mCompositingFrame && !mCurrentDecodingFrameIndex) {
-    // Update the composite frame
-    PRInt32 x;
-    aFrame->GetX(&x);
-    aFrame->DrawTo(mCompositingFrame, x, aRect->y, aRect->width, aRect->height);
-  }
-    return NS_OK;
-}
-
-//******************************************************************************
-/* void onStopFrame (in imgIRequest aRequest, in nsISupports cx, in gfxIImageFrame aFrame); */
-NS_IMETHODIMP imgContainer::OnStopFrame(imgIRequest *aRequest, nsISupports *cx, gfxIImageFrame *aFrame)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStopContainer (in imgIRequest aRequest, in nsISupports cx, in imgIContainer aContainer); */
-NS_IMETHODIMP imgContainer::OnStopContainer(imgIRequest *aRequest, nsISupports *cx, imgIContainer *aContainer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* void onStopDecode (in imgIRequest aRequest, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgContainer::OnStopDecode(imgIRequest *aRequest, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//******************************************************************************
-/* [noscript] void frameChanged (in imgIContainer aContainer, in nsISupports aCX, in gfxIImageFrame aFrame, in nsRect aDirtyRect); */
-NS_IMETHODIMP imgContainer::FrameChanged(imgIContainer *aContainer, nsISupports *aCX, gfxIImageFrame *aFrame, nsRect * aDirtyRect)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-

mozilla/modules/libpr0n/src/imgContainer.h

@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Chris Saari <saari@netscape.com>
- */
-
-#ifndef __imgContainer_h__
-#define __imgContainer_h__
-
-#include "imgIContainer.h"
-
-#include "imgIContainerObserver.h"
-
-#include "nsSize.h"
-
-#include "nsSupportsArray.h"
-
-#include "nsCOMPtr.h"
-#include "nsITimer.h"
-#include "nsITimerCallback.h"
-#include "imgIDecoderObserver.h"
-
-#include "gfxIImageFrame.h"
-
-#include "nsWeakReference.h"
-
-#define NS_IMGCONTAINER_CID \
-{ /* 5e04ec5e-1dd2-11b2-8fda-c4db5fb666e0 */         \
-     0x5e04ec5e,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0x8f, 0xda, 0xc4, 0xdb, 0x5f, 0xb6, 0x66, 0xe0} \
-}
-
-class imgContainer : public imgIContainer,
-                     public nsITimerCallback,
-                     public imgIDecoderObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGICONTAINER
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-
-  NS_IMETHOD_(void) Notify(nsITimer *timer);
-
-  imgContainer();
-  virtual ~imgContainer();
-
-private:
-  /* additional members */
-  nsSupportsArray mFrames;
-  nsSize mSize;
-  PRUint32 mCurrentDecodingFrameIndex; // 0 to numFrames-1
-  PRUint32 mCurrentAnimationFrameIndex; // 0 to numFrames-1
-  PRBool   mCurrentFrameIsFinishedDecoding;
-  PRBool   mDoneDecoding;
-  PRBool   mAnimating;
-  
-  nsWeakPtr mObserver;
-
-  // GIF specific bits
-  nsCOMPtr<nsITimer> mTimer;
-  
-  // GIF animations will use the mCompositingFrame to composite images
-  // and just hand this back to the caller when it is time to draw the frame.
-  nsCOMPtr<gfxIImageFrame> mCompositingFrame;
-  
-  // Private function for doing the frame compositing of animations and in cases
-  // where there is a backgound color and single frame placed withing a larger
-  // logical screen size. Smart GIF compressors may do this to save space.
-  void DoComposite(gfxIImageFrame** aFrameToUse, nsRect* aDirtyRect,
-                   PRInt32 aPrevFrame, PRInt32 aNextFrame);
-};
-
-#endif /* __imgContainer_h__ */
-

mozilla/modules/libpr0n/src/imgLoader.cpp

@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgLoader.h"
-
-#include "imgIRequest.h"
-
-#include "nsIServiceManager.h"
-
-#include "nsIChannel.h"
-#include "nsIIOService.h"
-#include "nsILoadGroup.h"
-#include "nsIStreamListener.h"
-#include "nsIURI.h"
-
-#include "imgRequest.h"
-#include "imgRequestProxy.h"
-
-#include "ImageCache.h"
-
-#include "nsXPIDLString.h"
-
-#include "nsCOMPtr.h"
-
-#include "ImageLogging.h"
-
-NS_IMPL_ISUPPORTS1(imgLoader, imgILoader)
-
-imgLoader::imgLoader()
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgLoader::~imgLoader()
-{
-  /* destructor code */
-}
-
-/* imgIRequest loadImage (in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx); */
-NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx, imgIRequest **_retval)
-{
-  NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
-
-  if (!aURI)
-    return NS_ERROR_NULL_POINTER;
-
-#if defined(PR_LOGGING)
-  nsXPIDLCString spec;
-  aURI->GetSpec(getter_Copies(spec));
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get());
-#endif
-
-  imgRequest *request = nsnull;
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-  ImageCache::Get(aURI, &request, getter_AddRefs(entry)); // addrefs request
-
-  if (request && entry && aLoadGroup) {
-    /* this isn't exactly what I want here.  This code will re-doom every cache hit in a document while
-       it is force reloading.  So for multiple copies of an image on a page, when you force reload, this
-       will cause you to get seperate loads for each copy of the image... this sucks.
-     */
-    PRUint32 flags = 0;
-    PRBool doomRequest = PR_FALSE;
-    aLoadGroup->GetDefaultLoadAttributes(&flags);
-    if (flags & nsIChannel::FORCE_RELOAD)
-      doomRequest = PR_TRUE;
-    else {
-      nsCOMPtr<nsIRequest> r;
-      aLoadGroup->GetDefaultLoadRequest(getter_AddRefs(r));
-      if (r) {
-        nsCOMPtr<nsIChannel> c(do_QueryInterface(r));
-        if (c) {
-          c->GetLoadAttributes(&flags);
-          if (flags & nsIChannel::FORCE_RELOAD)
-            doomRequest = PR_TRUE;
-        }
-      }
-    }
-
-    if (doomRequest) {
-      entry->Doom(); // doom this thing.
-      entry = nsnull;
-      NS_RELEASE(request);
-      request = nsnull;
-    }
-  }
-#endif
-
-  if (!request) {
-    /* no request from the cache.  do a new load */
-    LOG_SCOPE(gImgLog, "imgLoader::LoadImage |cache miss|");
-
-    nsCOMPtr<nsIIOService> ioserv(do_GetService("@mozilla.org/network/io-service;1"));
-    if (!ioserv) return NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsIChannel> newChannel;
-    ioserv->NewChannelFromURI(aURI, getter_AddRefs(newChannel));
-    if (!newChannel) return NS_ERROR_FAILURE;
-
-    if (aLoadGroup) {
-      PRUint32 flags;
-      aLoadGroup->GetDefaultLoadAttributes(&flags);
-      newChannel->SetLoadAttributes(flags);
-    }
-
-    NS_NEWXPCOM(request, imgRequest);
-    if (!request) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(request);
-
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Created new imgRequest [request=%p]\n", this, request));
-
-#ifdef MOZ_NEW_CACHE
-    ImageCache::Put(aURI, request, getter_AddRefs(entry));
-#endif
-
-#ifdef MOZ_NEW_CACHE
-    request->Init(newChannel, entry);
-#else
-    request->Init(newChannel, nsnull);
-#endif
-
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n", this));
-
-    // XXX are we calling this too early?
-    newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, request), nsnull);
-
-  } else {
-    /* request found in cache.  use it */
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgLoader::LoadImage |cache hit| [request=%p]\n",
-            this, request));
-  }
-
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgLoader::LoadImage -- creating proxy request.\n", this));
-
-  imgRequestProxy *proxyRequest;
-  NS_NEWXPCOM(proxyRequest, imgRequestProxy);
-  if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(proxyRequest);
-
-  // init adds itself to imgRequest's list of observers
-  proxyRequest->Init(request, aLoadGroup, aObserver, cx);
-
-  NS_RELEASE(request);
-
-  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
-  NS_ADDREF(*_retval);
-
-  NS_RELEASE(proxyRequest);
-
-  return NS_OK;
-}
-
-/* imgIRequest loadImageWithChannel(in nsIChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
-NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *cx, nsIStreamListener **listener, imgIRequest **_retval)
-{
-  NS_ASSERTION(channel, "imgLoader::LoadImageWithChannel -- NULL channel pointer");
-
-  imgRequest *request = nsnull;
-
-  nsCOMPtr<nsIURI> uri;
-  channel->GetOriginalURI(getter_AddRefs(uri));
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> entry;
-  ImageCache::Get(uri, &request, getter_AddRefs(entry)); // addrefs request
-#endif
-  if (request) {
-    // we have this in our cache already.. cancel the current (document) load
-
-    // XXX
-    // if *listener is null when we return here, the caller should probably cancel
-    // the channel instead of us doing it here.
-    channel->Cancel(NS_BINDING_ABORTED); // this should fire an OnStopRequest
-
-    *listener = nsnull; // give them back a null nsIStreamListener
-  } else {
-    NS_NEWXPCOM(request, imgRequest);
-    if (!request) return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(request);
-
-#ifdef MOZ_NEW_CACHE
-    ImageCache::Put(uri, request, getter_AddRefs(entry));
-#endif
-
-#ifdef MOZ_NEW_CACHE
-    request->Init(channel, entry);
-#else
-    request->Init(channel, nsnull);
-#endif
-
-    *listener = NS_STATIC_CAST(nsIStreamListener*, request);
-    NS_IF_ADDREF(*listener);
-  }
-
-  imgRequestProxy *proxyRequest;
-  NS_NEWXPCOM(proxyRequest, imgRequestProxy);
-  if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(proxyRequest);
-
-  // init adds itself to imgRequest's list of observers
-  proxyRequest->Init(request, nsnull, aObserver, cx);
-
-  NS_RELEASE(request);
-
-  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
-  NS_ADDREF(*_retval);
-
-  NS_RELEASE(proxyRequest);
-
-  return NS_OK;
-}

mozilla/modules/libpr0n/src/imgLoader.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgILoader.h"
-
-#ifdef LOADER_THREADSAFE
-#include "prlock.h"
-#endif
-
-#define NS_IMGLOADER_CID \
-{ /* 9f6a0d2e-1dd1-11b2-a5b8-951f13c846f7 */         \
-     0x9f6a0d2e,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0xa5, 0xb8, 0x95, 0x1f, 0x13, 0xc8, 0x46, 0xf7} \
-}
-
-class imgLoader : public imgILoader
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGILOADER
-
-  imgLoader();
-  virtual ~imgLoader();
-
-private:
-};

mozilla/modules/libpr0n/src/imgRequest.cpp

@@ -1,821 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequest.h"
-
-#include "nsIAtom.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIHTTPChannel.h"
-#include "nsIInputStream.h"
-
-#include "imgILoader.h"
-#include "nsIComponentManager.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-#include "nsString.h"
-#include "nsXPIDLString.h"
-
-#include "gfxIImageFrame.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICachingChannel.h"
-#endif
-#include "ImageCache.h"
-
-#include "ImageLogging.h"
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo *gImgLog = PR_NewLogModule("imgRequest");
-#endif
-
-NS_IMPL_ISUPPORTS7(imgRequest, imgIRequest, nsIRequest,
-                   imgIDecoderObserver, imgIContainerObserver,
-                   nsIStreamListener, nsIStreamObserver,
-                   nsISupportsWeakReference)
-
-imgRequest::imgRequest() : 
-  mObservers(0), mLoading(PR_FALSE), mProcessing(PR_FALSE), mStatus(imgIRequest::STATUS_NONE), mState(0)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgRequest::~imgRequest()
-{
-  /* destructor code */
-}
-
-
-nsresult imgRequest::Init(nsIChannel *aChannel, nsICacheEntryDescriptor *aCacheEntry)
-{
-  // XXX we should save off the thread we are getting called on here so that we can proxy all calls to mDecoder to it.
-
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::Init\n", this));
-
-  NS_ASSERTION(!mImage, "imgRequest::Init -- Multiple calls to init");
-  NS_ASSERTION(aChannel, "imgRequest::Init -- No channel");
-
-  mChannel = aChannel;
-
-#ifdef MOZ_NEW_CACHE
-  mCacheEntry = aCacheEntry;
-#endif
-
-  // XXX do not init the image here.  this has to be done from the image decoder.
-  mImage = do_CreateInstance("@mozilla.org/image/container;1");
-
-  return NS_OK;
-}
-
-nsresult imgRequest::AddObserver(imgIDecoderObserver *observer)
-{
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::AddObserver", "observer", observer);
-
-  mObservers.AppendElement(NS_STATIC_CAST(void*, observer));
-
-  // OnStartDecode
-  if (mState & onStartDecode)
-    observer->OnStartDecode(nsnull, nsnull);
-
-  // OnStartContainer
-  if (mState & onStartContainer)
-    observer->OnStartContainer(nsnull, nsnull, mImage);
-
-  // Send frame messages (OnStartFrame, OnDataAvailable, OnStopFrame)
-  PRUint32 nframes;
-  mImage->GetNumFrames(&nframes);
-
-  if (nframes > 0) {
-    nsCOMPtr<gfxIImageFrame> frame;
-    
-    // Is this a single frame image?
-    if (nframes == 1) {
-      // Get the first frame
-      mImage->GetFrameAt(0, getter_AddRefs(frame));
-      NS_ASSERTION(frame, "GetFrameAt gave back a null frame!");
-    } else if (nframes > 1) {
-      /* multiple frames, we'll use the current one */
-      mImage->GetCurrentFrame(getter_AddRefs(frame));
-      NS_ASSERTION(frame, "GetCurrentFrame gave back a null frame!");
-    }
-    
-    // OnStartFrame
-    observer->OnStartFrame(nsnull, nsnull, frame);
-    
-    if (!(mState & onStopContainer)) {
-      // OnDataAvailable
-      nsRect r;
-      frame->GetRect(r);  // XXX we shouldn't send the whole rect here
-      observer->OnDataAvailable(nsnull, nsnull, frame, &r);
-    } else {
-      // OnDataAvailable
-      nsRect r;
-      frame->GetRect(r);  // We're done loading this image, send the the whole rect
-      observer->OnDataAvailable(nsnull, nsnull, frame, &r);
-      
-      // OnStopFrame
-      observer->OnStopFrame(nsnull, nsnull, frame);
-    }
-  }
-
-  // OnStopContainer
-  if (mState & onStopContainer)
-    observer->OnStopContainer(nsnull, nsnull, mImage);
-
-  nsresult status;
-  if (mStatus & imgIRequest::STATUS_LOAD_COMPLETE)
-    status = NS_IMAGELIB_SUCCESS_LOAD_FINISHED;
-  else if (mStatus & imgIRequest::STATUS_ERROR)
-    status = NS_IMAGELIB_ERROR_FAILURE;
-
-  // OnStopDecode
-  if (mState & onStopDecode)
-    observer->OnStopDecode(nsnull, nsnull, status, nsnull);
-
-  if (mImage && (mObservers.Count() == 1)) {
-    PRUint32 nframes;
-    mImage->GetNumFrames(&nframes);
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgRequest::AddObserver -- starting animation\n", this));
-
-    mImage->StartAnimation();
-  }
-
-  if (mState & onStopRequest) {
-    nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(observer));
-    PR_ASSERT(observer);
-    ob->OnStopRequest(nsnull, nsnull, status, nsnull);
-  } 
-
-  return NS_OK;
-}
-
-nsresult imgRequest::RemoveObserver(imgIDecoderObserver *observer, nsresult status)
-{
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::RemoveObserver", "observer", observer);
-
-  mObservers.RemoveElement(NS_STATIC_CAST(void*, observer));
-
-  if (mObservers.Count() == 0) {
-    if (mImage) {
-      PRUint32 nframes;
-      mImage->GetNumFrames(&nframes);
-      if (nframes > 1) {
-        PR_LOG(gImgLog, PR_LOG_DEBUG,
-               ("[this=%p] imgRequest::RemoveObserver -- stopping animation\n", this));
-
-        mImage->StopAnimation();
-      }
-    }
-
-    if (mChannel && mLoading) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::RemoveObserver -- load in progress.  canceling\n", this));
-
-      this->RemoveFromCache();
-      this->Cancel(NS_BINDING_ABORTED);
-
-      if (!(mState & onStopDecode)) {
-        // make sure that observer gets an onStopRequest message sent to it
-        observer->OnStopDecode(nsnull, nsnull, NS_IMAGELIB_ERROR_FAILURE, nsnull);
-      }
-
-      if (!(mState & onStopRequest)) {
-        // make sure that observer gets an onStopRequest message sent to it
-        nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(observer));
-        PR_ASSERT(observer);
-        ob->OnStopRequest(nsnull, nsnull, NS_BINDING_ABORTED, nsnull);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-PRBool imgRequest::RemoveFromCache()
-{
-  LOG_SCOPE(gImgLog, "imgRequest::RemoveFromCache");
-
-#ifdef MOZ_NEW_CACHE
-
-  if (mCacheEntry) {
-    mCacheEntry->Doom();
-    mCacheEntry = nsnull;
-  } else {
-    NS_WARNING("imgRequest::RemoveFromCache -- no entry!");
-  }
-
-#endif
-
-  return PR_TRUE;
-}
-
-
-/**  nsIRequest / imgIRequest methods **/
-
-/* readonly attribute wstring name; */
-NS_IMETHODIMP imgRequest::GetName(PRUnichar * *aName)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::GetName");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isPending (); */
-NS_IMETHODIMP imgRequest::IsPending(PRBool *_retval)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* readonly attribute nsresult status; */
-NS_IMETHODIMP imgRequest::GetStatus(nsresult *aStatus)
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::GetStatus");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cancel (in nsresult status); */
-NS_IMETHODIMP imgRequest::Cancel(nsresult status)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::Cancel");
-
-  if (mImage) {
-    PRUint32 nframes;
-    mImage->GetNumFrames(&nframes);
-    if (nframes > 1) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::RemoveObserver -- stopping animation\n", this));
-
-      mImage->StopAnimation();
-    }
-  }
-
-  if (mChannel && mLoading)
-    mChannel->Cancel(NS_BINDING_ABORTED); // should prolly use status here
-
-  return NS_OK;
-}
-
-/* void suspend (); */
-NS_IMETHODIMP imgRequest::Suspend()
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void resume (); */
-NS_IMETHODIMP imgRequest::Resume()
-{
-    NS_NOTYETIMPLEMENTED("imgRequest::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/** imgIRequest methods **/
-
-/* readonly attribute imgIContainer image; */
-NS_IMETHODIMP imgRequest::GetImage(imgIContainer * *aImage)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetImage\n", this));
-
-  *aImage = mImage;
-  NS_IF_ADDREF(*aImage);
-  return NS_OK;
-}
-
-/* readonly attribute unsigned long imageStatus; */
-NS_IMETHODIMP imgRequest::GetImageStatus(PRUint32 *aStatus)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetImageStatus\n", this));
-
-  *aStatus = mStatus;
-  return NS_OK;
-}
-
-/* readonly attribute nsIURI URI; */
-NS_IMETHODIMP imgRequest::GetURI(nsIURI **aURI)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::GetURI\n", this));
-
-  if (mChannel)
-    return mChannel->GetOriginalURI(aURI);
-  else if (mURI) {
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute imgIDecoderObserver decoderObserver; */
-NS_IMETHODIMP imgRequest::GetDecoderObserver(imgIDecoderObserver **aDecoderObserver)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-/** imgIContainerObserver methods **/
-
-/* [noscript] void frameChanged (in imgIContainer container, in nsISupports cx, in gfxIImageFrame newframe, in nsRect dirtyRect); */
-NS_IMETHODIMP imgRequest::FrameChanged(imgIContainer *container, nsISupports *cx, gfxIImageFrame *newframe, nsRect * dirtyRect)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::FrameChanged");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->FrameChanged(container, cx, newframe, dirtyRect);
-  }
-
-  return NS_OK;
-}
-
-/** imgIDecoderObserver methods **/
-
-/* void onStartDecode (in imgIRequest request, in nsISupports cx); */
-NS_IMETHODIMP imgRequest::OnStartDecode(imgIRequest *request, nsISupports *cx)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartDecode");
-
-  mState |= onStartDecode;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartDecode(request, cx);
-  }
-
-  return NS_OK;
-}
-
-/* void onStartContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequest::OnStartContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartContainer");
-
-  mState |= onStartContainer;
-
-  mStatus |= imgIRequest::STATUS_SIZE_AVAILABLE;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartContainer(request, cx, image);
-  }
-
-  return NS_OK;
-}
-
-/* void onStartFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequest::OnStartFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartFrame");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStartFrame(request, cx, frame);
-  }
-
-  return NS_OK;
-}
-
-/* [noscript] void onDataAvailable (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect); */
-NS_IMETHODIMP imgRequest::OnDataAvailable(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame, const nsRect * rect)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnDataAvailable");
-
-  nsCOMPtr<imgIDecoderObserver> container = do_QueryInterface(mImage);
-  container->OnDataAvailable(request, cx, frame, rect);
-  
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnDataAvailable(request, cx, frame, rect);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequest::OnStopFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  NS_ASSERTION(frame, "imgRequest::OnStopFrame called with NULL frame");
-
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopFrame");
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-#ifdef MOZ_NEW_CACHE
-  if (mCacheEntry) {
-    PRUint32 cacheSize = 0;
-
-    mCacheEntry->GetDataSize(&cacheSize);
-
-    PRUint32 imageSize = 0;
-    PRUint32 alphaSize = 0;
-
-    frame->GetImageDataLength(&imageSize);
-    frame->GetAlphaDataLength(&alphaSize);
-
-    mCacheEntry->SetDataSize(cacheSize + imageSize + alphaSize);
-  }
-#endif
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopFrame(request, cx, frame);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequest::OnStopContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopContainer");
-
-  mState |= onStopContainer;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopContainer(request, cx, image);
-  }
-
-  return NS_OK;
-}
-
-/* void onStopDecode (in imgIRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *aRequest, nsISupports *aCX, nsresult aStatus, const PRUnichar *aStatusArg)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStopDecode");
-
-  if (mState & onStopDecode) {
-    NS_WARNING("OnStopDecode called multiple times.");
-    return NS_OK;
-  }
-
-  mState |= onStopDecode;
-
-  if (!(mStatus & imgIRequest::STATUS_ERROR) && NS_FAILED(aStatus))
-    mStatus |= imgIRequest::STATUS_ERROR;
-
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  nsresult status;
-  if (mStatus & imgIRequest::STATUS_LOAD_COMPLETE)
-    status = NS_IMAGELIB_SUCCESS_LOAD_FINISHED;
-  else if (mStatus & imgIRequest::STATUS_ERROR)
-    status = NS_IMAGELIB_ERROR_FAILURE;
-
-  while (++i < count) {
-    imgIDecoderObserver *ob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (ob) ob->OnStopDecode(aRequest, aCX, status, aStatusArg);
-  }
-
-  return NS_OK;
-}
-
-
-
-
-
-
-/** nsIStreamObserver methods **/
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt)
-{
-  LOG_SCOPE(gImgLog, "imgRequest::OnStartRequest");
-
-  NS_ASSERTION(!mDecoder, "imgRequest::OnStartRequest -- we already have a decoder");
-  NS_ASSERTION(!mLoading, "imgRequest::OnStartRequest -- we are loading again?");
-
-  /* set our loading flag to true */
-  mLoading = PR_TRUE;
-
-  /* notify our kids */
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, mObservers[i]);
-    if (iob) {
-      nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(iob));
-      if (ob) ob->OnStartRequest(aRequest, ctxt);
-    }
-  }
-
-  /* do our real work */
-  nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
-
-  if (!mChannel) {
-    PR_LOG(gImgLog, PR_LOG_ALWAYS,
-           (" `->  Channel already stopped or no channel!?.\n"));
-
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIHTTPChannel> httpChannel(do_QueryInterface(chan));
-  if (httpChannel) {
-    PRUint32 httpStatus;
-    httpChannel->GetResponseStatus(&httpStatus);
-    if (httpStatus == 404) {
-      PR_LOG(gImgLog, PR_LOG_DEBUG,
-             ("[this=%p] imgRequest::OnStartRequest -- http status = 404. canceling.\n", this));
-
-      mStatus |= imgIRequest::STATUS_ERROR;
-      this->Cancel(NS_BINDING_ABORTED);
-      this->RemoveFromCache();
-
-      return NS_BINDING_ABORTED;
-    }
-
-  }
-
-  /* get the expires info */
-#if defined(MOZ_NEW_CACHE)
-  if (mCacheEntry) {
-    nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(chan));
-    if (cacheChannel) {
-      nsCOMPtr<nsISupports> cacheToken;
-      cacheChannel->GetCacheToken(getter_AddRefs(cacheToken));
-      if (cacheToken) {
-        nsCOMPtr<nsICacheEntryDescriptor> entryDesc(do_QueryInterface(cacheToken));
-        if (entryDesc) {
-          PRUint32 expiration;
-          /* get the expiration time from the caching channel's token */
-          entryDesc->GetExpirationTime(&expiration);
-
-          /* set the expiration time on our entry */
-          mCacheEntry->SetExpirationTime(expiration);
-        }
-      }
-    }
-  }
-#endif
-
-  return NS_OK;
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status, const PRUnichar *statusArg)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::OnStopRequest\n", this));
-
-  NS_ASSERTION(mChannel && mLoading, "imgRequest::OnStopRequest -- received multiple OnStopRequest");
-
-  mState |= onStopRequest;
-
-  /* set our loading flag to false */
-  mLoading = PR_FALSE;
-
-  /* set our processing flag to false */
-  mProcessing = PR_FALSE;
-
-#ifdef MOZ_NEW_CACHE
-  /* break the cycle from the cache entry. */
-  mCacheEntry = nsnull;
-#endif
-
-  if (NS_FAILED(status)) {
-    mStatus |= imgIRequest::STATUS_ERROR;
-    this->RemoveFromCache();
-    this->Cancel(status); // stops animations
-  } else {
-    mStatus |= imgIRequest::STATUS_LOAD_COMPLETE;
-  }
-
-  mChannel->GetOriginalURI(getter_AddRefs(mURI));
-  mChannel = nsnull; // we no longer need the channel
-
-  if (mDecoder) {
-    mDecoder->Flush();
-    mDecoder->Close();
-    mDecoder = nsnull; // release the decoder so that it can rest peacefully ;)
-  }
-
-  /* notify the kids */
-  PRInt32 i = -1;
-  PRInt32 count = mObservers.Count();
-
-  while (++i < count) {
-    void *item = NS_STATIC_CAST(void *, mObservers[i]);
-    if (item) {
-      imgIDecoderObserver *iob = NS_STATIC_CAST(imgIDecoderObserver*, item);
-      if (iob) {
-        nsCOMPtr<nsIStreamObserver> ob(do_QueryInterface(iob));
-        if (ob) ob->OnStopRequest(aRequest, ctxt, status, statusArg);
-      }
-    }
-  }
-
-  // if there was an error loading the image, (mState & onStopDecode) won't be true.
-  // Send an onStopDecode message
-  if (!(mState & onStopDecode)) {
-    this->OnStopDecode(nsnull, nsnull, status, statusArg);
-  }
-
-  return NS_OK;
-}
-
-
-
-
-/* prototype for this defined below */
-static NS_METHOD sniff_mimetype_callback(nsIInputStream* in, void* closure, const char* fromRawSegment,
-                                         PRUint32 toOffset, PRUint32 count, PRUint32 *writeCount);
-
-
-/** nsIStreamListener methods **/
-
-/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt, in nsIInputStream inStr, in unsigned long sourceOffset, in unsigned long count); */
-NS_IMETHODIMP imgRequest::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequest::OnDataAvailable\n", this));
-
-  NS_ASSERTION(mChannel, "imgRequest::OnDataAvailable -- no channel!");
-
-
-  if (!mProcessing) {
-    /* set our processing flag to true if this is the first OnDataAvailable() */
-    mProcessing = PR_TRUE;
-
-    /* look at the first few bytes and see if we can tell what the data is from that
-     * since servers tend to lie. :(
-     */
-    PRUint32 out;
-    inStr->ReadSegments(sniff_mimetype_callback, this, count, &out);
-
-#ifdef NS_DEBUG
-    /* NS_WARNING if the content type from the channel isn't the same if the sniffing */
-#endif
-
-    if (!mContentType.get()) {
-      nsXPIDLCString contentType;
-      nsresult rv = mChannel->GetContentType(getter_Copies(contentType));
-
-      if (NS_FAILED(rv)) {
-        PR_LOG(gImgLog, PR_LOG_ERROR,
-               ("[this=%p] imgRequest::OnStartRequest -- Content type unavailable from the channel\n",
-                this));
-
-        this->RemoveFromCache();
-
-        return NS_BINDING_ABORTED; //NS_BASE_STREAM_CLOSED;
-      }
-
-      mContentType = contentType;
-    }
-
-#if defined(PR_LOGGING)
-    PR_LOG(gImgLog, PR_LOG_DEBUG,
-           ("[this=%p] imgRequest::OnStartRequest -- Content type is %s\n", this, mContentType.get()));
-#endif
-
-    nsCAutoString conid("@mozilla.org/image/decoder;2?type=");
-    conid += mContentType.get();
-
-    mDecoder = do_CreateInstance(conid);
-
-    if (!mDecoder) {
-      PR_LOG(gImgLog, PR_LOG_WARNING,
-             ("[this=%p] imgRequest::OnStartRequest -- Decoder not available\n", this));
-
-      // no image decoder for this mimetype :(
-      this->Cancel(NS_BINDING_ABORTED);
-      this->RemoveFromCache();
-
-      // XXX notify the person that owns us now that wants the imgIContainer off of us?
-      return NS_IMAGELIB_ERROR_NO_DECODER;
-    }
-
-    mDecoder->Init(NS_STATIC_CAST(imgIRequest*, this));
-
-  }
-
-  if (!mDecoder) {
-    PR_LOG(gImgLog, PR_LOG_WARNING,
-           ("[this=%p] imgRequest::OnDataAvailable -- no decoder\n", this));
-
-    return NS_BASE_STREAM_CLOSED;
-  }
-
-  PRUint32 wrote;
-  nsresult rv = mDecoder->WriteFrom(inStr, count, &wrote);
-
-  return NS_OK;
-}
-
-static NS_METHOD sniff_mimetype_callback(nsIInputStream* in,
-                                         void* closure,
-                                         const char* fromRawSegment,
-                                         PRUint32 toOffset,
-                                         PRUint32 count,
-                                         PRUint32 *writeCount)
-{
-  imgRequest *request = NS_STATIC_CAST(imgRequest*, closure);
-
-  NS_ASSERTION(request, "request is null!");
-
-  if (count > 0)
-    request->SniffMimeType(fromRawSegment, count);
-
-  *writeCount = 0;
-  return NS_ERROR_FAILURE;
-}
-
-void
-imgRequest::SniffMimeType(const char *buf, PRUint32 len)
-{
-  /* Is it a GIF? */
-  if (len >= 4 && !nsCRT::strncmp(buf, "GIF8", 4))  {
-    mContentType = NS_LITERAL_CSTRING("image/gif");
-    return;
-  }
-
-  /* or a PNG? */
-  if (len >= 4 && ((unsigned char)buf[0]==0x89 &&
-                   (unsigned char)buf[1]==0x50 &&
-                   (unsigned char)buf[2]==0x4E &&
-                   (unsigned char)buf[3]==0x47))
-  { 
-    mContentType = NS_LITERAL_CSTRING("image/png");
-    return;
-  }
-
-  /* maybe a JPEG (JFIF)? */
-  /* JFIF files start with SOI APP0 but older files can start with SOI DQT
-   * so we test for SOI followed by any marker, i.e. FF D8 FF
-   * this will also work for SPIFF JPEG files if they appear in the future.
-   *
-   * (JFIF is 0XFF 0XD8 0XFF 0XE0 <skip 2> 0X4A 0X46 0X49 0X46 0X00)
-   */
-  if (len >= 3 &&
-     ((unsigned char)buf[0])==0xFF &&
-     ((unsigned char)buf[1])==0xD8 &&
-     ((unsigned char)buf[2])==0xFF)
-  {
-    mContentType = NS_LITERAL_CSTRING("image/jpeg");
-    return;
-  }
-
-  /* or how about ART? */
-  /* ART begins with JG (4A 47). Major version offset 2.
-   * Minor version offset 3. Offset 4 must be NULL.
-   */
-  if (len >= 5 &&
-   ((unsigned char) buf[0])==0x4a &&
-   ((unsigned char) buf[1])==0x47 &&
-   ((unsigned char) buf[4])==0x00 )
-  {
-    mContentType = NS_LITERAL_CSTRING("image/x-jg");
-    return;
-  }
-
-  /* none of the above?  I give up */
-}

mozilla/modules/libpr0n/src/imgRequest.h

@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef imgRequest_h__
-#define imgRequest_h__
-
-#include "imgIRequest.h"
-
-#include "nsIRunnable.h"
-
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "imgIContainer.h"
-#include "imgIDecoder.h"
-#include "imgIDecoderObserver.h"
-#include "nsIStreamListener.h"
-#include "nsCOMPtr.h"
-
-#include "nsVoidArray.h"
-#include "nsWeakReference.h"
-
-#include "nsString.h"
-
-#ifdef MOZ_NEW_CACHE
-#include "nsICacheEntryDescriptor.h"
-#else
-class nsICacheEntryDescriptor;
-#endif
-
-#define NS_IMGREQUEST_CID \
-{ /* 9f733dd6-1dd1-11b2-8cdf-effb70d1ea71 */         \
-     0x9f733dd6,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0x8c, 0xdf, 0xef, 0xfb, 0x70, 0xd1, 0xea, 0x71} \
-}
-
-enum {
-  onStartDecode = 0x1,
-  onStartContainer = 0x2,
-  onStopContainer = 0x4,
-  onStopDecode = 0x8,
-  onStopRequest = 0x16
-};
-
-class imgRequest : public imgIRequest,
-                   public imgIDecoderObserver, 
-                   public nsIStreamListener,
-                   public nsSupportsWeakReference
-{
-public:
-  imgRequest();
-  virtual ~imgRequest();
-
-  /* additional members */
-  nsresult Init(nsIChannel *aChannel, nsICacheEntryDescriptor *aCacheEntry);
-  nsresult AddObserver(imgIDecoderObserver *observer);
-  nsresult RemoveObserver(imgIDecoderObserver *observer, nsresult status);
-
-  PRBool RemoveFromCache();
-
-  void SniffMimeType(const char *buf, PRUint32 len);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIREQUEST
-  NS_DECL_NSIREQUEST
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSISTREAMOBSERVER
-
-private:
-  nsCOMPtr<nsIChannel> mChannel;
-  nsCOMPtr<nsIURI> mURI;
-  nsCOMPtr<imgIContainer> mImage;
-  nsCOMPtr<imgIDecoder> mDecoder;
-
-  nsVoidArray mObservers;
-
-  PRBool mLoading;
-  PRBool mProcessing;
-
-  PRUint32 mStatus;
-  PRUint32 mState;
-
-  nsCString mContentType;
-
-#ifdef MOZ_NEW_CACHE
-  nsCOMPtr<nsICacheEntryDescriptor> mCacheEntry; /* we hold on to this to this so long as we have observers */
-#endif
-};
-
-#endif

mozilla/modules/libpr0n/src/imgRequestProxy.cpp

@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequestProxy.h"
-
-#include "nsXPIDLString.h"
-
-#include "nsIInputStream.h"
-#include "imgILoader.h"
-#include "nsIComponentManager.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-#include "imgRequest.h"
-
-#include "nsString.h"
-
-#include "DummyChannel.h"
-
-#include "nspr.h"
-
-#include "ImageLogging.h"
-
-NS_IMPL_ISUPPORTS5(imgRequestProxy, imgIRequest, nsIRequest, imgIDecoderObserver, imgIContainerObserver, nsIStreamObserver)
-
-imgRequestProxy::imgRequestProxy() :
-  mCanceled(PR_FALSE)
-{
-  NS_INIT_ISUPPORTS();
-  /* member initializers and constructor code */
-}
-
-imgRequestProxy::~imgRequestProxy()
-{
-  /* destructor code */
-
-  // XXX pav
-  // it isn't the job of the request proxy to cancel itself.
-  // if your object goes away and you want to cancel the load, then do it yourself.
-
-  // cancel here for now until i make this work right like the above comment
-  Cancel(NS_ERROR_FAILURE);
-}
-
-
-
-nsresult imgRequestProxy::Init(imgRequest *request, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx)
-{
-  PR_ASSERT(request);
-
-  LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequestProxy::Init", "request", request);
-
-  mOwner = NS_STATIC_CAST(imgIRequest*, request);
-
-  mObserver = aObserver;
-  // XXX we should save off the thread we are getting called on here so that we can proxy all calls to mDecoder to it.
-
-  mContext = cx;
-
-  // XXX we should only create a channel, etc if the image isn't finished loading already.
-
-  nsISupports *inst = nsnull;
-  inst = new DummyChannel(this, aLoadGroup);
-  NS_ADDREF(inst);
-  nsresult res = inst->QueryInterface(NS_GET_IID(nsIChannel), getter_AddRefs(mDummyChannel));
-  NS_RELEASE(inst);
-
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  mDummyChannel->GetLoadGroup(getter_AddRefs(loadGroup));
-  if (loadGroup) {
-    loadGroup->AddRequest(mDummyChannel, cx);
-  }
-
-  request->AddObserver(this);
-
-  return NS_OK;
-}
-
-/**  nsIRequest / imgIRequest methods **/
-
-/* readonly attribute wstring name; */
-NS_IMETHODIMP imgRequestProxy::GetName(PRUnichar * *aName)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* boolean isPending (); */
-NS_IMETHODIMP imgRequestProxy::IsPending(PRBool *_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* readonly attribute nsresult status; */
-NS_IMETHODIMP imgRequestProxy::GetStatus(nsresult *aStatus)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void cancel (in nsresult status); */
-NS_IMETHODIMP imgRequestProxy::Cancel(nsresult status)
-{
-  if (mCanceled)
-    return NS_ERROR_FAILURE;
-
-  LOG_SCOPE(gImgLog, "imgRequestProxy::Cancel");
-
-  mCanceled = PR_TRUE;
-
-  NS_ASSERTION(mOwner, "canceling request proxy twice");
-
-  nsresult rv = NS_REINTERPRET_CAST(imgRequest*, mOwner.get())->RemoveObserver(this, status);
-
-  mOwner = nsnull;
-
-  return rv;
-}
-
-/* void suspend (); */
-NS_IMETHODIMP imgRequestProxy::Suspend()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/* void resume (); */
-NS_IMETHODIMP imgRequestProxy::Resume()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-/**  imgIRequest methods **/
-
-/* readonly attribute imgIContainer image; */
-NS_IMETHODIMP imgRequestProxy::GetImage(imgIContainer * *aImage)
-{
-  if (!mOwner)
-    return NS_ERROR_FAILURE;
-
-  return mOwner->GetImage(aImage);
-}
-
-/* readonly attribute unsigned long imageStatus; */
-NS_IMETHODIMP imgRequestProxy::GetImageStatus(PRUint32 *aStatus)
-{
-  if (!mOwner) {
-    *aStatus = imgIRequest::STATUS_ERROR;
-    return NS_ERROR_FAILURE;
-  }
-
-  return mOwner->GetImageStatus(aStatus);
-}
-
-/* readonly attribute nsIURI URI; */
-NS_IMETHODIMP imgRequestProxy::GetURI(nsIURI **aURI)
-{
-  if (!mOwner)
-    return NS_ERROR_FAILURE;
-
-  return mOwner->GetURI(aURI);
-}
-
-/* readonly attribute imgIDecoderObserver decoderObserver; */
-NS_IMETHODIMP imgRequestProxy::GetDecoderObserver(imgIDecoderObserver **aDecoderObserver)
-{
-  *aDecoderObserver = mObserver;
-  NS_IF_ADDREF(*aDecoderObserver);
-  return NS_OK;
-}
-
-
-/** imgIContainerObserver methods **/
-
-/* [noscript] void frameChanged (in imgIContainer container, in nsISupports cx, in gfxIImageFrame newframe, in nsRect dirtyRect); */
-NS_IMETHODIMP imgRequestProxy::FrameChanged(imgIContainer *container, nsISupports *cx, gfxIImageFrame *newframe, nsRect * dirtyRect)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::FrameChanged\n", this));
-
-  if (mObserver)
-    mObserver->FrameChanged(container, mContext, newframe, dirtyRect);
-
-  return NS_OK;
-}
-
-/** imgIDecoderObserver methods **/
-
-/* void onStartDecode (in imgIRequest request, in nsISupports cx); */
-NS_IMETHODIMP imgRequestProxy::OnStartDecode(imgIRequest *request, nsISupports *cx)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartDecode\n", this));
-
-  if (mObserver)
-    mObserver->OnStartDecode(this, mContext);
-
-  return NS_OK;
-}
-
-/* void onStartContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequestProxy::OnStartContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartContainer\n", this));
-
-  if (mObserver)
-    mObserver->OnStartContainer(this, mContext, image);
-
-  return NS_OK;
-}
-
-/* void onStartFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequestProxy::OnStartFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStartFrame\n", this));
-
-  if (mObserver)
-    mObserver->OnStartFrame(this, mContext, frame);
-
-  return NS_OK;
-}
-
-/* [noscript] void onDataAvailable (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect); */
-NS_IMETHODIMP imgRequestProxy::OnDataAvailable(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame, const nsRect * rect)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnDataAvailable\n", this));
-
-  if (mObserver)
-    mObserver->OnDataAvailable(this, mContext, frame, rect);
-
-  return NS_OK;
-}
-
-/* void onStopFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
-NS_IMETHODIMP imgRequestProxy::OnStopFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopFrame\n", this));
-
-  if (mObserver)
-    mObserver->OnStopFrame(this, mContext, frame);
-
-  return NS_OK;
-}
-
-/* void onStopContainer (in imgIRequest request, in nsISupports cx, in imgIContainer image); */
-NS_IMETHODIMP imgRequestProxy::OnStopContainer(imgIRequest *request, nsISupports *cx, imgIContainer *image)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopContainer\n", this));
-
-  if (mObserver)
-    mObserver->OnStopContainer(this, mContext, image);
-
-  return NS_OK;
-}
-
-/* void onStopDecode (in imgIRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
-NS_IMETHODIMP imgRequestProxy::OnStopDecode(imgIRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
-{
-  PR_LOG(gImgLog, PR_LOG_DEBUG,
-         ("[this=%p] imgRequestProxy::OnStopDecode\n", this));
-
-  if (mObserver)
-    mObserver->OnStopDecode(this, mContext, status, statusArg);
-
-  return NS_OK;
-}
-
-
-
-
-
-/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
-NS_IMETHODIMP imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
-{
-  return NS_OK;
-}
-
-/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult statusCode, in wstring statusText); */
-NS_IMETHODIMP imgRequestProxy::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult statusCode, const PRUnichar *statusText)
-{
-  if (!mDummyChannel)
-    return NS_OK;
-
-  nsCOMPtr<nsILoadGroup> loadGroup;
-  mDummyChannel->GetLoadGroup(getter_AddRefs(loadGroup));
-  if (loadGroup) {
-    loadGroup->RemoveRequest(mDummyChannel, mContext, statusCode, statusText);
-  }
-  mDummyChannel = nsnull;
-
-  return NS_OK;
-}
-

mozilla/modules/libpr0n/src/imgRequestProxy.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is mozilla.org code.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation.
- * All Rights Reserved.
- * 
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "imgRequest.h"
-#include "imgIDecoderObserver.h"
-
-#include "imgIContainer.h"
-#include "imgIDecoder.h"
-#include "nsIStreamObserver.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsCOMPtr.h"
-
-#define NS_IMGREQUESTPROXY_CID \
-{ /* 20557898-1dd2-11b2-8f65-9c462ee2bc95 */         \
-     0x20557898,                                     \
-     0x1dd2,                                         \
-     0x11b2,                                         \
-    {0x8f, 0x65, 0x9c, 0x46, 0x2e, 0xe2, 0xbc, 0x95} \
-}
-
-class imgRequestProxy : public imgIRequest,
-                        public imgIDecoderObserver,
-                        public nsIStreamObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIREQUEST
-  NS_DECL_NSIREQUEST
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-  NS_DECL_NSISTREAMOBSERVER
-
-  imgRequestProxy();
-  virtual ~imgRequestProxy();
-
-  /* additional members */
-  nsresult Init(imgRequest *request, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx);
-
-private:
-  nsCOMPtr<imgIDecoderObserver> mObserver;
-
-  nsCOMPtr<nsISupports> mContext;
-
-  nsCOMPtr<imgIRequest> mOwner;
-
-  nsCOMPtr<nsIChannel> mDummyChannel;
-
-  PRBool mCanceled;
-};

mozilla/modules/libpr0n/src/makefile.win

@@ -1,56 +0,0 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is mozilla.org code
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-MODULE			= imglib2
-LIBRARY_NAME	= imglib2
-DLL			= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
-
-OBJS	= \
-		.\$(OBJDIR)\DummyChannel.obj \
-		.\$(OBJDIR)\ImageCache.obj \
-		.\$(OBJDIR)\ImageFactory.obj \
-		.\$(OBJDIR)\imgContainer.obj \
-		.\$(OBJDIR)\imgLoader.obj \
-		.\$(OBJDIR)\imgRequest.obj \
-		.\$(OBJDIR)\imgRequestProxy.obj \
-		$(NULL)
-
-LLIBS=\
-	$(LIBNSPR) \
-	$(DIST)\lib\xpcom.lib \
-	$(DIST)\lib\gkgfxwin.lib \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/modules/libpr0n/src/win32.order

@@ -1,90 +0,0 @@
-?AddRef@imgRequestProxy@@UAGKXZ ; 143798
-?Release@imgContainer@@UAGKXZ ; 120291
-?OnDataAvailable@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 84442
-?QueryInterface@imgContainer@@UAGIABUnsID@@PAPAX@Z ; 76980
-?OnDataAvailable@imgContainer@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 75604
-?OnDataAvailable@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@PBUnsRect@@@Z ; 75604
-?AddRef@DummyChannel@@UAGKXZ ; 45629
-?QueryInterface@DummyChannel@@UAGIABUnsID@@PAPAX@Z ; 45310
-?GetImage@imgRequest@@UAGIPAPAVimgIContainer@@@Z ; 41814
-?Release@DummyChannel@@UAGKXZ ; 41716
-?GetImage@imgRequestProxy@@UAGIPAPAVimgIContainer@@@Z ; 40453
-?GetFrameAt@imgContainer@@UAGIIPAPAVgfxIImageFrame@@@Z ; 39613
-?GetHeight@imgContainer@@UAGIPAH@Z ; 32348
-?Release@imgRequest@@UAGKXZ ; 31603
-?AddRef@imgRequest@@UAGKXZ ; 31603
-?GetNumFrames@imgContainer@@UAGIPAI@Z ; 28342
-?GetImageStatus@imgRequestProxy@@UAGIPAI@Z ; 27464
-?Release@imgRequestProxy@@UAGKXZ ; 23383
-?GetCurrentFrame@imgContainer@@UAGIPAPAVgfxIImageFrame@@@Z ; 19319
-?QueryInterface@imgRequest@@UAGIABUnsID@@PAPAX@Z ; 16120
-?assign_assuming_AddRef@nsCOMPtr_base@@IAEXPAVnsISupports@@@Z ; 13764
-?FrameChanged@imgRequestProxy@@UAGIPAVimgIContainer@@PAVnsISupports@@PAVgfxIImageFrame@@PAUnsRect@@@Z ; 13455
-?QueryInterface@imgRequestProxy@@UAGIABUnsID@@PAPAX@Z ; 10170
-?Notify@imgContainer@@UAGXPAVnsITimer@@@Z ; 9611
-??0nsQueryReferent@@QAE@PAVnsIWeakReference@@PAI@Z ; 9611
-?FrameChanged@imgRequest@@UAGIPAVimgIContainer@@PAVnsISupports@@PAVgfxIImageFrame@@PAUnsRect@@@Z ; 9609
-?DoComposite@imgContainer@@AAEXPAPAVgfxIImageFrame@@PAUnsRect@@HH@Z ; 9608
-?GetLoadAttributes@DummyChannel@@UAGIPAI@Z ; 8258
-?Cancel@imgRequestProxy@@UAGII@Z ; 7509
-?GetLoadGroup@DummyChannel@@UAGIPAPAVnsILoadGroup@@@Z ; 7456
-?GetURI@imgRequest@@UAGIPAPAVnsIURI@@@Z ; 5395
-?GetURI@imgRequestProxy@@UAGIPAPAVnsIURI@@@Z ; 5395
-?GetCacheSession@@YAXPAPAVnsICacheSession@@@Z ; 5165
-?GetWidth@imgContainer@@UAGIPAH@Z ; 4675
-?Release@imgLoader@@UAGKXZ ; 3791
-?AddObserver@imgRequest@@QAEIPAVimgIDecoderObserver@@@Z ; 3789
-?Get@ImageCache@@SAHPAVnsIURI@@PAPAVimgRequest@@PAPAVnsICacheEntryDescriptor@@@Z ; 3789
-?RemoveObserver@imgRequest@@QAEIPAVimgIDecoderObserver@@I@Z ; 3789
-?Init@imgRequestProxy@@QAEIPAVimgRequest@@PAVnsILoadGroup@@PAVimgIDecoderObserver@@PAVnsISupports@@@Z ; 3789
-?QueryInterface@imgLoader@@UAGIABUnsID@@PAPAX@Z ; 3789
-??0imgRequestProxy@@QAE@XZ ; 3789
-??0DummyChannel@@QAE@PAVimgIRequest@@PAVnsILoadGroup@@@Z ; 3789
-?LoadImage@imgLoader@@UAGIPAVnsIURI@@PAVnsILoadGroup@@PAVimgIDecoderObserver@@PAVnsISupports@@PAPAVimgIRequest@@@Z ; 3789
-??1imgRequestProxy@@UAE@XZ ; 3667
-??1DummyChannel@@QAE@XZ ; 3667
-??_EimgRequestProxy@@UAEPAXI@Z ; 3667
-?OnStopRequest@imgRequestProxy@@UAGIPAVnsIRequest@@PAVnsISupports@@IPBG@Z ; 3667
-?OnStopDecode@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@IPBG@Z ; 3652
-?OnStartContainer@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 3652
-?OnStopContainer@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 3652
-?OnStartDecode@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@@Z ; 3652
-?OnStopFrame@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 3491
-?OnStartFrame@imgRequestProxy@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 3491
-?OnStartRequest@imgRequestProxy@@UAGIPAVnsIRequest@@PAVnsISupports@@@Z ; 2714
-?OnStopFrame@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 2082
-?AppendFrame@imgContainer@@UAGIPAVgfxIImageFrame@@@Z ; 2082
-?OnStartFrame@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVgfxIImageFrame@@@Z ; 2082
-?EndFrameDecode@imgContainer@@UAGIII@Z ; 1996
-?StartAnimation@imgContainer@@UAGIXZ ; 1747
-?OnDataAvailable@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@PAVnsIInputStream@@II@Z ; 1415
-??0imgContainer@@QAE@XZ ; 1376
-??1imgRequest@@UAE@XZ ; 1376
-?OnStopRequest@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@IPBG@Z ; 1376
-?Init@imgRequest@@QAEIPAVnsIChannel@@PAVnsICacheEntryDescriptor@@@Z ; 1376
-??1imgContainer@@UAE@XZ ; 1376
-?Put@ImageCache@@SAHPAVnsIURI@@PAVimgRequest@@PAPAVnsICacheEntryDescriptor@@@Z ; 1376
-??_GimgRequest@@UAEPAXI@Z ; 1376
-??_EimgContainer@@UAEPAXI@Z ; 1376
-??0imgRequest@@QAE@XZ ; 1376
-?OnStartRequest@imgRequest@@UAGIPAVnsIRequest@@PAVnsISupports@@@Z ; 1367
-?OnStartContainer@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 1361
-?Init@imgContainer@@UAGIHHPAVimgIContainerObserver@@@Z ; 1361
-?OnStartDecode@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@@Z ; 1361
-?SniffMimeType@imgRequest@@QAEXPBDI@Z ; 1361
-?OnStopContainer@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@PAVimgIContainer@@@Z ; 1361
-?OnStopDecode@imgRequest@@UAGIPAVimgIRequest@@PAVnsISupports@@IPBG@Z ; 1361
-?GetContentType@DummyChannel@@UAGIPAPAD@Z ; 1275
-?DecodingComplete@imgContainer@@UAGIXZ ; 1275
-?Cancel@DummyChannel@@UAGII@Z ; 122
-?StopAnimation@imgContainer@@UAGIXZ ; 121
-?GetDecoderObserver@imgRequestProxy@@UAGIPAPAVimgIDecoderObserver@@@Z ; 84
-??0nsGetInterface@@QAE@PAVnsISupports@@PAI@Z ; 77
-_NSGetModule ; 1
-??_EimgLoader@@UAEPAXI@Z ; 1
-??1imgLoader@@UAE@XZ ; 1
-?Shutdown@ImageCache@@SAXXZ ; 1
-??0imgLoader@@QAE@XZ ; 1
-?do_GetService@@YA?BVnsGetServiceByContractID@@PBDPAI@Z ; 1
-?Cancel@imgRequest@@UAGII@Z ; 1
-?RemoveFromCache@imgRequest@@QAEHXZ ; 1

mozilla/network/Makefile

@@ -0,0 +1,39 @@
+#! gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+#  
+#
+
+DEPTH	= ..
+
+DIRS	= \
+	cache		\
+	client		\
+	cnvts		\
+	mimetype	\
+	main		\
+	protocol	\
+	util
+
+ifdef MODULAR_NETLIB
+DIRS	+= module
+endif
+
+include $(DEPTH)/config/rules.mk
+
+INCLUDE += $(PUBLIC)\ldap $(PUBLIC)\security
+

mozilla/network/cache/MANIFEST

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+extcache.h
+netcache.h

mozilla/network/cache/Makefile

@@ -0,0 +1,42 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH		= ../..
+
+MODULE		= netcache
+LIBRARY_NAME	= netcache
+
+CSRCS		= \
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+	$(NULL)
+
+ifdef NU_CACHE
+CSRCS += \
+	nucacheproto.c	\
+	$(NULL)
+endif
+
+EXPORTS= netcache.h mkcache.h mkmemcac.h extcache.h
+
+REQUIRES	= network nspr2 dbm util pref js java fileurl security layer img jtools cachelib
+
+include $(DEPTH)/config/rules.mk
+

mozilla/network/cache/cachedump.c

@@ -0,0 +1,139 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* this little program will sequentially dump out
+ * every record in the database
+ */
+#include "mkcache.h"
+#include "extcache.h"
+#include "plstr.h"
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+#ifdef _sgi
+#include <sys/endian.h> 
+#endif /* _sgi */
+
+/* URL methods
+ */
+#define URL_GET_METHOD  0
+#define URL_POST_METHOD 1
+#define URL_HEAD_METHOD 2
+
+static DB *
+net_OpenExtCacheFatDB(char *filename)
+{
+	DB *rv;
+    HASHINFO hash_info = {
+        16*1024,  /* bucket size */
+        0,        /* fill factor */
+        0,        /* number of elements */
+        0,        /* bytes to cache */
+        0,        /* hash function */
+        0};       /* byte order */
+
+
+	rv = dbopen(filename,
+									O_RDWR | O_CREAT,
+									0644,
+									DB_HASH,
+				&hash_info);
+
+	if(!rv)
+	  {
+		printf("Could not open cache database: %s\n", filename);
+		exit(1);
+	  }
+	
+	return(rv);
+}
+
+int main(int argc, char **argv)
+{
+    char url[4028];
+    struct stat stat_s;
+    net_CacheObject * cache_obj;
+	DB * ext_cache_database=0;
+	DBT key;
+	DBT data;
+    int len;
+    char *end;
+
+    memset(&cache_obj, 0, sizeof(net_CacheObject));
+
+    if(argc != 2)
+      {
+        printf("Usage:\n"
+                "%s database\n"
+                "\n"
+                "database: path and name of the database\n", argv[0]);
+        exit(1);
+      }
+
+    /* open the cache database */
+    ext_cache_database = net_OpenExtCacheFatDB(argv[1]);
+
+	if(!ext_cache_database)
+	  {
+		perror("Could not open cache database");
+		exit(1);
+	  }
+
+	while(!(ext_cache_database->seq)(ext_cache_database, &key, &data, 0))
+	  {
+
+        if(key.size == PL_strlen(EXT_CACHE_NAME_STRING)
+            && !PL_strcmp(key.data, EXT_CACHE_NAME_STRING))
+          {
+            /* make sure it's a terminated string */
+            if(((char *)data.data)[data.size-1] == '\0')
+                printf("\n\nDatabase Name: %s\n", (char*)data.data);
+            else
+                 printf("\n\nDatabase Name is corrupted!\n");
+			printf("\n--------------------------------------\n");
+			continue;
+		  }
+
+		/* try and convert the db struct to a cache struct */
+	    cache_obj = net_DBDataToCacheStruct(&data);
+
+		if(!cache_obj)
+		  {
+			printf("Malformed database entry:\n");
+			printf("key: ");
+			fwrite(key.data, 1, key.size, stdout);
+			printf("\ndata: ");
+			fwrite(data.data, 1, data.size, stdout);
+			printf("\n");
+			printf("--------------------------------------\n");
+			continue;
+		  }
+
+	    /* the URL is 8 bytes into the key struct
+	     */
+	    printf("URL: %s\n",(char*)key.data+8);
+	    printf("file: %s\n", cache_obj->filename);
+	    printf("is_relative_path: %s\n", cache_obj->is_relative_path ? "TRUE" : "FALSE");
+	    printf("content_type: %s\n", cache_obj->content_type);
+	    printf("content_length: %d\n", cache_obj->content_length);
+	    printf("last_modified: %s\n", ctime(&cache_obj->last_modified));
+		printf("--------------------------------------\n");
+	  }
+}
+

mozilla/network/cache/cacheutils.h

@@ -0,0 +1,21 @@
+
+#ifndef CACHEUTILS_H
+#define CACHEUTILS_H
+
+/* Find an actively-loading cache file for URL_s in context, and copy the first
+ * nbytes of it to a new cache file.  Return a cache converter stream by which
+ * the caller can append to the cloned cache file.
+ */
+extern NET_VoidStreamClass *
+NET_CloneWysiwygCacheFile(MWContext *context, URL_Struct *URL_s,
+                          uint32 nbytes, const char * wysiwyg_url,
+                          const char * base_href);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_VoidStreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+                              uint32 nbytes, const char * wysiwyg_url,
+                              const char * base_href);
+
+#endif /* CACHEUTILS_H */

mozilla/network/cache/export.mac

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+extcache.h
+netcache.h

mozilla/network/cache/extcache.c

@@ -0,0 +1,857 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Please leave outside of ifdef for window precompiled headers */
+#include "mkcache.h"
+
+#ifdef MOZILLA_CLIENT
+#include "mktrace.h"
+#include "prmem.h"
+#include "plstr.h"
+
+/* Publicly released Netscape cache access routines.
+ *
+ * These routines are shared between the netscape executable
+ * and the programs released as a cache developers kit.
+ *
+ * Created: Lou Montulli <montulli@netscape.com>, July-95.
+ * Modifications/Addition: Gagan Saksena, 97
+ */
+
+#include "rosetta.h"
+
+#ifndef EXT_DB_ROUTINES
+#include "secnav.h"
+#include "sechash.h"
+#endif
+
+#include "extcache.h"  /* include this for everything */
+
+#ifdef EXT_DB_ROUTINES
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+typedef struct {
+	int32 len;
+	char *data;
+} SECItem;
+
+#ifdef _sgi
+#include <sys/endian.h>
+#endif /* _sgi */
+
+
+/* URL methods
+ */
+ #define URL_GET_METHOD  0
+ #define URL_POST_METHOD 1
+ #define URL_HEAD_METHOD 2
+
+#endif /* DB_STORE */
+
+
+MODULE_PRIVATE DBT *
+net_CacheDBTDup(DBT *obj)
+{
+	DBT * rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	rv->size = obj->size;
+	rv->data = PR_Malloc(rv->size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	memcpy(rv->data, obj->data, rv->size);
+
+	return(rv);
+
+}
+
+/* free the cache object
+ */
+MODULE_PRIVATE void net_freeCacheObj (net_CacheObject * cache_obj)
+{
+
+    PR_FREEIF(cache_obj->address);
+    PR_FREEIF(cache_obj->post_data);
+    PR_FREEIF(cache_obj->post_headers);
+    PR_FREEIF(cache_obj->content_type);
+    PR_FREEIF(cache_obj->charset);
+    PR_FREEIF(cache_obj->content_encoding);
+    PR_FREEIF(cache_obj->page_services_url);
+    PR_FREEIF(cache_obj->filename);
+	
+#ifndef EXT_DB_ROUTINES
+    PR_FREEIF(cache_obj->sec_info);
+#endif
+	
+    PR_Free(cache_obj);
+}
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+#define MAX_VALID_DBT_SIZE 10000
+
+MODULE_PRIVATE PRBool
+net_IsValidCacheDBT(DBT *obj)
+{
+    char *cur_ptr, *max_ptr;
+    uint32 len;
+
+	if(!obj || obj->size < 9 || obj->size > MAX_VALID_DBT_SIZE)
+		return(FALSE);
+
+    cur_ptr = (char *)obj->data;
+    max_ptr = cur_ptr+obj->size;
+
+    /* get the total size of the struct out of
+     * the first field to check it
+     */
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != obj->size)
+      {
+        TRACEMSG(("Size going in is not the same as size coming out"));
+        return(FALSE);
+      }
+
+    /* get the version number of the written structure
+     */
+    if(cur_ptr > max_ptr)
+        return(FALSE);
+    COPY_INT32(&len, cur_ptr);
+    cur_ptr += sizeof(int32);
+
+    if(len != CACHE_FORMAT_VERSION)
+      {
+        TRACEMSG(("Version of cache structure is wrong!: %d", len));
+        return(FALSE);
+      }
+
+	/* looks good to me... */
+	return(TRUE);
+}
+
+
+/* takes a cache object and returns a malloc'd 
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+MODULE_PRIVATE DBT *
+net_CacheStructToDBData(net_CacheObject * old_obj)
+{
+    int32 len;
+	char *cur_ptr;
+	void *new_obj;
+	int32 total_size;
+	DBT *rv;
+
+	rv = PR_NEW(DBT);
+
+	if(!rv)
+		return(NULL);
+
+	total_size = sizeof(net_CacheObject);
+
+#define ADD_STRING_SIZE(string) \
+total_size += old_obj->string ? PL_strlen(old_obj->string)+1 : 0
+
+	ADD_STRING_SIZE(address);
+	total_size += old_obj->post_data_size+1;
+	ADD_STRING_SIZE(post_headers);
+	ADD_STRING_SIZE(content_type);
+	ADD_STRING_SIZE(content_encoding);
+	ADD_STRING_SIZE(charset);
+	ADD_STRING_SIZE(filename);
+    total_size += sizeof(uint32); /* size of secinfo */
+	total_size += HG73653(old_obj->sec_info);
+	ADD_STRING_SIZE(page_services_url);
+
+#undef ADD_STRING_SIZE
+	
+	new_obj = PR_Malloc(total_size * sizeof(char));
+
+	if(!new_obj)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	memset(new_obj, 0, total_size * sizeof(char));
+
+	/*
+	 * order is:
+	 * int32	size of the entire structure;
+	 *
+	 * int32    version of the structure format (CACHE_FORMAT_VERSION)
+	 *
+     * time_t                  last_modified;
+     * time_t                  last_accessed;
+     * time_t                  expires;
+     * uint32                  content_length;
+     * XP_Bool                    is_netsite;
+	 *
+ 	 * time_t                  lock_date;
+	 *
+     * char                  * filename;
+     * int32                   filename_len;
+	 *
+     * int32                   HG52242;
+     * unsigned char         * HG42320;
+	 *
+     * int32                   method;
+	 *
+	 * # don't store address, or post_data stuff
+	 * # char                  * address;
+     * # uint32                  post_data_size;
+     * # char                  * post_data;
+	 *
+     * char                  * post_headers;
+     * char                  * content_type;
+     * char                  * content_encoding;
+     * char                  * charset;
+	 *
+	 * XP_Bool                    incomplete_file;
+	 * uint32                  total_content_length;
+	 *
+	 * char                  * page_services_url;
+ 	 * 
+	 * string lengths all include null terminators
+	 * all integer constants are stored as 4 bytes
+	 * all booleans are stored as one byte
+	 */
+
+	/* VERY VERY IMPORTANT.  Whenever the
+	 * format of the record structure changes
+ 	 * you must verify that the byte positions	
+	 * in extcache.h are updated
+	 */
+
+#define STUFF_STRING(string) 									\
+{	 															\
+  len = (old_obj->string ? PL_strlen(old_obj->string)+1 : 0);	\
+  COPY_INT32((void *)cur_ptr, &len);							\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+  if(len)														\
+      memcpy((void *)cur_ptr, old_obj->string, len);			\
+  cur_ptr += len;												\
+}
+
+#define STUFF_NUMBER(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(int32);							\
+}
+
+#define STUFF_TIMET(number) 									\
+{ 																\
+  COPY_INT32((void *)cur_ptr, &old_obj->number);				\
+  cur_ptr = cur_ptr + sizeof(time_t);							\
+}
+
+#define STUFF_BOOL(bool_val)	 									\
+{ 																	\
+  if(old_obj->bool_val)												\
+    ((char *)(cur_ptr))[0] = 1;										\
+  else																\
+    ((char *)(cur_ptr))[0] = 0;										\
+  cur_ptr = cur_ptr + sizeof(char);									\
+}
+
+	cur_ptr = (char *)new_obj;
+
+	/* put the total size of the struct into
+	 * the first field so that we have
+	 * a cross check against corruption
+	 */
+  	COPY_INT32((void *)cur_ptr, &total_size);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	HG73209
+	/* put the version number of the structure
+	 * format that we are using
+	 * By using a version string when writting
+	 * we can support backwards compatibility
+	 * in our reading code
+	 * (use "len" as a temp variable)
+	 */
+	len = CACHE_FORMAT_VERSION;
+  	COPY_INT32((void *)cur_ptr, &len);
+  	cur_ptr = cur_ptr + sizeof(int32);
+
+	STUFF_TIMET(last_modified);
+	STUFF_TIMET(last_accessed);
+	STUFF_TIMET(expires);
+	STUFF_NUMBER(content_length);
+	STUFF_BOOL(is_netsite);
+
+	STUFF_TIMET(lock_date);
+
+	STUFF_STRING(filename);
+	STUFF_NUMBER(filename_len);
+
+	STUFF_BOOL(is_relative_path);
+
+	STUFF_NUMBER(security_on);
+
+#ifndef EXT_DB_ROUTINES
+    HG42539
+    /* save the security info */
+    if ( old_obj->sec_info ) {
+		len = HG65293(old_obj->sec_info);
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+
+		memcpy((void *)cur_ptr, old_obj->sec_info, len);
+		cur_ptr += len;
+	} else
+#endif
+    {
+		len = 0;
+		COPY_INT32((void *)cur_ptr, &len);
+		cur_ptr = cur_ptr + sizeof(int32);
+	}
+
+    STUFF_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	STUFF_STRING(address);
+	STUFF_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(old_obj->post_data_size)
+	  {
+	    memcpy(cur_ptr, old_obj->post_data, old_obj->post_data_size+1);
+	    cur_ptr += old_obj->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	STUFF_STRING(post_headers);
+
+	STUFF_STRING(content_type);
+	STUFF_STRING(content_encoding);
+	STUFF_STRING(charset);
+
+	STUFF_BOOL(incomplete_file);
+	STUFF_NUMBER(real_content_length);
+
+	STUFF_STRING(page_services_url);
+
+#undef STUFF_STRING
+#undef STUFF_NUMBER
+#undef STUFF_BOOL
+
+	rv->data = new_obj;
+	rv->size = total_size;
+
+	return(rv);
+
+}
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error 
+ */
+MODULE_PRIVATE net_CacheObject *
+net_DBDataToCacheStruct(DBT * db_obj)
+{
+	net_CacheObject * rv = PR_NEW(net_CacheObject);
+	char * cur_ptr;
+	char * max_ptr;
+	uint32 len;
+	int32 version;
+
+	if(!rv)
+		return NULL;
+
+	memset(rv, 0, sizeof(net_CacheObject));
+
+/* if any strings are larger than this then
+ * there was a serious database error
+ */
+#define MAX_HUGE_STRING_SIZE 10000
+
+#define RETRIEVE_STRING(string)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+	  {					 						\
+		net_freeCacheObj(rv);				 	\
+        return(NULL);                           \
+	  }											\
+	COPY_INT32(&len, cur_ptr);					\
+	cur_ptr += sizeof(int32);					\
+	if(len)										\
+	  {											\
+		if(len > MAX_HUGE_STRING_SIZE)			\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    rv->string = (char*)PR_Malloc(len);		\
+		if(!rv->string)							\
+	      {				 						\
+		    net_freeCacheObj(rv);				\
+			return(NULL);						\
+	      }										\
+	    memcpy(rv->string, cur_ptr, len);	\
+	    cur_ptr += len;							\
+	  }											\
+}											
+
+#define RETRIEVE_NUMBER(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+	COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(int32);					\
+}
+
+#define RETRIEVE_TIMET(number)					\
+{												\
+    if(cur_ptr > max_ptr)                       \
+        return(rv);                             \
+    COPY_INT32(&rv->number, cur_ptr);			\
+	cur_ptr += sizeof(time_t);					\
+}
+
+#define RETRIEVE_BOOL(bool)				\
+{										\
+  if(cur_ptr > max_ptr)                 \
+    return(rv);                         \
+  if(((char *)(cur_ptr))[0])			\
+	rv->bool = TRUE;					\
+  else 									\
+	rv->bool = FALSE;					\
+  cur_ptr += sizeof(char);				\
+}
+
+	cur_ptr = (char *)db_obj->data;
+
+	max_ptr = cur_ptr+db_obj->size;
+
+	/* get the total size of the struct out of
+	 * the first field to check it
+	 */
+	COPY_INT32(&len, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(len != db_obj->size)
+	  {
+		TRACEMSG(("Size going in is not the same as size coming out"));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	/* get the version number of the written structure
+	 */
+    if(cur_ptr > max_ptr)
+        return(rv);
+	COPY_INT32(&version, cur_ptr);
+	cur_ptr += sizeof(int32);
+
+	if(version != CACHE_FORMAT_VERSION)
+	  {
+		TRACEMSG(("Version of cache structure is wrong!: %d", version));
+		PR_Free(rv);
+		return(NULL);
+	  }
+
+	HG32839
+	RETRIEVE_TIMET(last_modified);
+	RETRIEVE_TIMET(last_accessed);
+	RETRIEVE_TIMET(expires);
+	RETRIEVE_NUMBER(content_length);
+	RETRIEVE_BOOL(is_netsite);
+
+	RETRIEVE_TIMET(lock_date);
+
+	RETRIEVE_STRING(filename);
+	RETRIEVE_NUMBER(filename_len);
+
+	RETRIEVE_BOOL(is_relative_path);
+
+	HG72761 
+
+	RETRIEVE_NUMBER(method);
+
+#ifdef STORE_ADDRESS_AND_POST_DATA
+
+	RETRIEVE_STRING(address);
+	RETRIEVE_NUMBER(post_data_size);
+	
+	/* post_data 
+	 * this is special since it not necessarily a string
+	 */
+	if(rv->post_data_size)
+	  {
+		rv->post_data = PR_Malloc(rv->post_data_size+1);
+		if(rv->post_data)
+			memcpy(rv->post_data, cur_ptr, rv->post_data_size+1);
+		cur_ptr += rv->post_data_size+1;
+	  }
+
+#endif /* STORE_ADDRESS_AND_POST_DATA */
+
+	RETRIEVE_STRING(post_headers);
+
+	RETRIEVE_STRING(content_type);
+	RETRIEVE_STRING(content_encoding);
+	RETRIEVE_STRING(charset);
+
+	RETRIEVE_BOOL(incomplete_file);
+	RETRIEVE_NUMBER(real_content_length);
+
+	RETRIEVE_STRING(page_services_url);
+#undef RETRIEVE_STRING
+#undef RETRIEVE_NUMBER
+#undef RETRIEVE_BOOL
+
+	return(rv);
+}
+
+#if defined(DEBUG) && defined(UNIX)
+int
+cache_test_me()
+{
+
+	net_CacheObject test;
+	net_CacheObject *rv;
+	int32 total_size;
+	DBT *db_obj;
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test1");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test1: %s\n", rv->address);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test2");
+	StrAllocCopy(test.charset, "test2");
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test2: %s	%s\n", rv->address, rv->charset);
+
+	memset(&test, 0, sizeof(net_CacheObject));
+	StrAllocCopy(test.address, "test3");
+	StrAllocCopy(test.charset, "test3");
+	test.content_length = 3 ;
+	test.method = 3 ;
+	test.is_netsite = 3 ;
+	db_obj = net_CacheStructToDBData(&test);
+	rv = net_DBDataToCacheStruct(db_obj);
+	printf("test3: %s	%s	%d	%d	%s\n", 
+			rv->address, rv->charset,
+			rv->content_length, rv->method, 
+			(rv->is_netsite == 3 ? "TRUE" : "FALSE"));
+
+}
+#endif
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ * 
+ * Key is based on the address and the post_data
+ *
+ * looks like:
+ *  size checksum | size of address | ADDRESS | size of post data | POST DATA
+ */
+MODULE_PRIVATE DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size)
+{
+	DBT *rv = PR_NEW(DBT);
+	char *hash;
+	char *data_ptr;
+	int32 str_len;
+	int32 size;
+
+#define MD5_HASH_SIZE 16 /* always 16 due to md5 hash type */
+	
+	if(!rv)
+		return(NULL);
+	
+	if(!address)
+	  {
+		PR_ASSERT(0);
+		rv->size = 0;
+		return(rv);
+	  } 
+
+	hash = PL_strchr(address, '#');
+
+	/* don't include '#' in a key */
+	if(hash)
+		*hash = '\0';
+
+	str_len = PL_strlen(address)+1;
+
+	size  = sizeof(int32);  /* for check sum */
+	size += sizeof(int32);  /* for size of address */
+	size += str_len;        /* for address string */
+	size += sizeof(int32);  /* for size of post_data */
+
+	HG42490
+
+	rv->size = size;
+	rv->data = PR_Malloc(size);
+
+	if(!rv->data)
+	  {
+		PR_Free(rv);
+		return NULL;
+	  }
+
+	data_ptr = (char *) rv->data;
+
+	/* put in the checksum size */
+	COPY_INT32(data_ptr, &size);
+	data_ptr = data_ptr + sizeof(int32);
+	HG83777
+	
+	/* put in the size of the address string */
+	COPY_INT32(data_ptr, &str_len);
+	data_ptr = data_ptr + sizeof(int32);
+
+	/* put in the address string data */
+	memcpy(data_ptr, address, str_len);
+	data_ptr = data_ptr + str_len;
+
+	/* set the address back to it's original form */
+	if(hash)
+		*hash = '#';
+
+	/* put in the size of the post data */
+	HG73699
+	  {
+		COPY_INT32(data_ptr, &post_data_size);
+		data_ptr = data_ptr + sizeof(int32);
+	  }
+
+	return(rv);
+}
+
+/* returns a static string that contains the
+ * URL->address of the key
+ * 
+ * returns NULL on error
+ */
+MODULE_PRIVATE char *
+net_GetAddressFromCacheKey(DBT *key)
+{
+	uint32 size;
+	char *data;
+
+	/* check for minimum size */
+	if(key->size < 10)
+		return(NULL);
+	HG72873
+
+	/* validate size checksum */
+	data = (char *)key->data;
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	if(size != key->size)
+		return(NULL);
+
+	/* get size of address string */
+	COPY_INT32(&size, data);
+	data += sizeof(int32);
+
+	/* make sure it's a valid c string */
+	if(data[size] != '\0')
+		return(NULL);
+		
+	/* it's valid return it */
+	return(data);
+}
+
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t 
+net_GetTimeInCacheDBT(DBT *data, int byte_position)
+{
+	time_t date;
+	char *ptr = (char *)data->data;
+
+	if(data->size < byte_position+sizeof(time_t))
+		return(0);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+	COPY_INT32(&date, ptr+byte_position);
+
+	/* TRACEMSG(("Got date from cache DBT: %d", date)); */
+	
+	return(date);
+
+}
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ * 
+ * returns 0 on error
+ */
+MODULE_PRIVATE void
+net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date)
+{
+	char *ptr = (char *)data->data;
+
+    if(data->size < byte_position+sizeof(time_t))
+        return;
+
+	if(!net_IsValidCacheDBT(data))
+		return;
+
+    COPY_INT32(ptr+byte_position, &date);
+
+    return;
+
+}
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+#define MAX_FILE_SIZE 2048
+MODULE_PRIVATE char *
+net_GetFilenameInCacheDBT(DBT *data)
+{
+	int32 size;
+	char *rv;
+	char *ptr = (char*)data->data;
+
+    if(data->size < FILENAME_BYTE_POSITION)
+        return(NULL);
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    COPY_INT32(&size, ptr+FILENAME_SIZE_BYTE_POSITION);
+
+    if(data->size < FILENAME_BYTE_POSITION+size 
+		|| size > MAX_FILE_SIZE)
+        return(NULL);
+
+	rv = (char *)PR_Malloc(size);
+	if(!rv)
+		return(NULL);
+    memcpy(rv, ptr+FILENAME_BYTE_POSITION, size);
+
+	TRACEMSG(("Got filename: %s from DBT", rv));
+
+    return(rv);
+}
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+MODULE_PRIVATE time_t
+net_GetInt32InCacheDBT(DBT *data, int byte_position)
+{
+    int32 num;
+	char *ptr = (char *)data->data;
+
+	if(!net_IsValidCacheDBT(data))
+		return(0);
+
+    if(data->size < byte_position+sizeof(time_t))
+        return(0);
+
+    COPY_INT32(&num, ptr+byte_position);
+
+    /* TRACEMSG(("Got int32 from cache DBT: %d", num)); */
+   
+    return(num);
+
+}
+
+MODULE_PRIVATE void
+net_FreeCacheDBTdata(DBT *stuff)
+{
+	if(stuff)
+	  {
+		PR_Free(stuff->data);
+		PR_Free(stuff);
+	  }
+}
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+MODULE_PRIVATE net_CacheObject *
+net_Fast_DBDataToCacheStruct(DBT *obj)
+{
+	static net_CacheObject *rv=0;
+
+	/* free any previous one */
+	if(rv)
+		net_freeCacheObj(rv);
+
+	rv = net_DBDataToCacheStruct(obj);
+
+	return(rv);
+
+}
+
+#endif /* MOZILLA_CLIENT */

mozilla/network/cache/extcache.h

@@ -0,0 +1,272 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef EXT_CACHE_H
+#define EXT_CACHE_H
+
+#ifndef EXT_DB_ROUTINES
+#include "mcom_db.h"
+#endif
+
+#ifdef EXT_DB_ROUTINES
+#define PRBool char
+#define uint32 unsigned int
+#define int32  int
+#define PR_NEW(structure)  ((structure *) malloc(sizeof(structure)))
+#define PR_Malloc   (void *) malloc
+#define memcpy  memcpy
+#define memset  memset
+#define TRACEMSG(x) printf x
+#define FREEIF(x)  do { if(x) free(x); } while(0)
+#define FREE free
+#define PL_strlen  strlen
+#define PL_strchr  strchr
+#define PL_strcmp  strcmp
+#define PR_ASSERT  assert
+#define MODULE_PRIVATE
+#define PRIVATE static
+#define TRUE  !0
+#define FALSE 0
+
+#include <stdio.h>
+#include <string.h>
+#include <db.h>
+#endif 
+
+#ifndef EXT_DB_ROUTINES
+
+#ifndef NSPR20
+#include "prosdep.h"  /* for IS_LITTLE_ENDIAN / IS_BIG_ENDIAN */
+#else
+#include "prtypes.h"
+#endif
+
+#endif /* EXT_DB_ROUTINES */
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32));
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+#define EXT_CACHE_NAME_STRING "INT_ExternalCacheNameString"
+
+/* Internal WARNING!!  Some slots of this structure 
+ * are shared with URL_Struct and
+ * History_entry.  If you add a slot, decide whether it needs to be shared
+ * as well.
+ */
+typedef struct _net_CacheObject {
+    time_t  last_modified;
+    time_t  last_accessed;
+    time_t  expires;
+    PRBool    is_netsite;
+    uint32  content_length;
+
+    char    * filename;                 /* cache file name */
+    int32     filename_len;             /* optimization */
+    PRBool      is_relative_path;         /* is the path relative? */
+
+    /* Security information */
+    int32   security_on;                /* is security on? */
+    unsigned char *sec_info;
+
+    time_t  lock_date;                  /* the file is locked if this
+                                         * is non-zero.  The date
+                                         * represents the time the
+                                         * lock was put in place.
+                                         * Locks are only valid for
+                                         * one session
+                                         */
+
+    int32       method;
+    char    * address;
+    uint32    post_data_size;
+    char    * post_data;
+    char    * post_headers;
+    char    * content_type;
+    char    * content_encoding;
+    char    * charset;
+
+    PRBool      incomplete_file;          /* means that the whole
+                                         * file is not there.
+                                         * This can only be true
+                                         * if the server supports byteranges
+                                         */
+    uint32    real_content_length;      /* the whole content length
+                                         * i.e. the server size of a truncated 
+                                         * client file
+                                         */
+    char    * page_services_url;
+    char    * etag;			/* HTTP/1.1 Etag */
+
+} net_CacheObject;
+
+/* this is the version number of the cache database entry.
+ * It should be incremented in integer ingrements up
+ * to MAXINT32
+ */
+#define CACHE_FORMAT_VERSION 5
+
+/* these defines specify the exact byte position
+ * of the first 4 elements in the DBT data struct
+ * Change these if you change the order of entry into
+ * the DBT
+ */
+#define LAST_MODIFIED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)
+#define LAST_ACCESSED_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)
+#define EXPIRES_BYTE_POSITION         \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t)
+#define CONTENT_LENGTH_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)
+#define IS_NETSITE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)
+
+#define LOCK_DATE_BYTE_POSITION  \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(int32)+sizeof(char)
+
+#define FILENAME_SIZE_BYTE_POSITION   \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t)
+#define FILENAME_BYTE_POSITION        \
+                sizeof(int32)+sizeof(int32)+sizeof(time_t)+sizeof(time_t) \
+                +sizeof(time_t)+sizeof(uint32)+sizeof(char)+sizeof(time_t) \
+                +sizeof(int32)
+
+/* generates a key for use in the cache database
+ * from a CacheObject struct
+ *
+ * Key is based on the address and the post_data
+ */
+extern DBT *
+net_GenCacheDBKey(char *address, char *post_data, int32 post_data_size);
+
+/* returns a static string that contains the
+ * URL->address of the key
+ *
+ * returns NULL on error
+ */
+extern char *
+net_GetAddressFromCacheKey(DBT *key);
+
+
+/* allocs and copies a new DBT from an existing DBT
+ */
+extern DBT * net_CacheDBTDup(DBT *obj);
+
+/* free the cache object
+ */
+extern void net_freeCacheObj (net_CacheObject * cache_obj);
+
+/* takes a cache object and returns a malloc'd
+ * (void *) suitible for passing in as a database
+ * data storage object
+ */
+extern DBT * net_CacheStructToDBData(net_CacheObject * old_obj);
+
+/* takes a database storage object and returns a malloc'd
+ * cache data object.  The cache object needs all of
+ * it's parts free'd.
+ *
+ * returns NULL on parse error
+ */
+extern net_CacheObject * net_DBDataToCacheStruct(DBT * db_obj);
+
+/* checks a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetTimeInCacheDBT(DBT *data, int byte_position);
+
+/* Sets a date within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern void net_SetTimeInCacheDBT(DBT *data, int byte_position, time_t date);
+
+/* Gets the filename within a cache DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns NULL on error
+ */
+extern char * net_GetFilenameInCacheDBT(DBT *data);
+
+/* Gets a int32 within a DBT struct so
+ * that we don't have to convert it into a CacheObject
+ *
+ * This works because of the fixed length record format
+ * of the first part of the specific DBT format I'm
+ * using
+ *
+ * returns 0 on error
+ */
+extern time_t net_GetInt32InCacheDBT(DBT *data, int byte_position);
+
+/* free's a DBT struct
+ */
+extern void net_FreeCacheDBTdata(DBT *stuff);
+
+/* stores a cache object in the DBM database
+ */
+extern void net_ExtCacheStore(DB *database, net_CacheObject * obj);
+
+/* takes a database storage object and returns an un-malloc'd
+ * cache data object. The structure returned has pointers
+ * directly into the database memory and are only valid
+ * until the next call to any database function
+ *
+ * do not free anything returned by this structure
+ */
+extern net_CacheObject * net_Fast_DBDataToCacheStruct(DBT *obj);
+
+/* returns true if this DBT looks like a valid
+ * entry.  It looks at the checksum and the
+ * version number to see if it's valid
+ */
+extern PRBool net_IsValidCacheDBT(DBT *obj);
+
+#endif /* EXT_CACHE_H */

mozilla/network/cache/makefile.win

@@ -0,0 +1,105 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+#
+
+#------------------------------------------------------------------------
+#
+# Makefile to build the cache LIB
+#
+#------------------------------------------------------------------------
+
+#!ifdef MOZ_JAVA
+#LOCAL_JMC_SUBDIR = .
+#!endif
+
+#
+# Make sure we have MOZILLA_CLIENT defined so we get the
+#   proper JS includes
+#
+LCFLAGS		= $(LCFLAGS)  -DMOZILLA_CLIENT
+
+!ifdef BUILD_DEBUG_GC
+LCFLAGS		= $(LCFLAGS) -DDEBUG_GC
+!endif
+
+LLIBS=  \
+	$(NULL)
+MISCDEP=$(LLIBS)
+OBJS=   \
+	.\$(OBJDIR)\extcache.obj		\
+	.\$(OBJDIR)\mkcache.obj		\
+	.\$(OBJDIR)\mkextcac.obj		\
+	.\$(OBJDIR)\mkmemcac.obj		\
+!ifdef NU_CACHE
+	.\$(OBJDIR)\nucacheproto.obj		\
+!endif
+	$(NULL)
+	
+
+CSRCS =	\
+	cachedump.c	\
+	extcache.c	\
+	mkcache.c	\
+	mkextcac.c	\
+	mkmemcac.c	\
+!ifdef NU_CACHE
+	nucacheproto.c	\
+!endif
+	$(NULL)
+
+
+LIBRARY_NAME=netcache
+
+MODULE=netcache 
+DEPTH=..\..
+
+EXTRA_LIBS=
+
+REQUIRES= network nspr2 cachelib
+EXPORTS= netcache.h
+
+C_OBJS = \
+	$(NULL)
+	
+
+# use LINCS on win32 for now since REQUIRES seems to be broken
+#!if "$(MOZ_BITS)" != "16"
+LINCS= \
+    -I$(XPDIST)\public\nspr2 	\
+    -I$(XPDIST)\public\dbm 	\
+    -I$(XPDIST)\public\util	\
+    -I$(XPDIST)\public\pref 	\
+    -I$(XPDIST)\public\network 	\
+    -I$(XPDIST)\public\js 	\
+    -I$(XPDIST)\public\java 	\
+    -I$(XPDIST)\public\fileurl 	\
+    -I$(XPDIST)\public\security \
+    -I$(XPDIST)\public\cache 	\
+    -I$(XPDIST)\public\jtools
+#!endif
+
+include <$(DEPTH)\config\rules.mak> 
+
+libs:: $(LIBRARY)
+    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+
+symbols::
+	@echo "LIBRARY_NAME     is $(LIBRARY_NAME)"
+	@echo "LIBRARY          is $(LIBRARY)"

mozilla/network/cache/mkcache.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MKCACHE_H
+#define MKCACHE_H
+
+#include "xp.h"
+
+#ifndef EXT_CACHE_H
+#include "extcache.h"
+#endif
+
+#ifndef NU_CACHE
+/* trace variable for cache testing */
+extern PRBool NET_CacheTraceOn;
+#endif /* This is handled by CacheTrace_Enable() and CacheTrace_IsEnabled() in the NU world */
+
+PR_BEGIN_EXTERN_C
+#ifndef NU_CACHE
+/* public accessor function for netcaster */
+extern PRBool NET_CacheStore(net_CacheObject *cacheObject, URL_Struct *url_s, PRBool accept_partial_files);
+#endif
+PR_END_EXTERN_C
+
+#endif /* MKCACHE_H */

mozilla/network/cache/mkextcac.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MKEXTCACHE_H
+#define MKEXTCACHE_H
+
+#endif /* MKEXTCACHE_H */

mozilla/network/cache/mkmemcac.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef MK_MEMORY_CACHE_H
+
+#include "mkgeturl.h"
+
+/* A pointer to this struct is passed as the converter_obj argument to
+ * NET_MemCacheConverter.
+ */
+typedef struct net_MemCacheConverterObject {
+    NET_StreamClass *next_stream;
+	PRBool         dont_hold_URL_s;
+} net_MemCacheConverterObject;
+
+extern NET_StreamClass * 
+NET_MemCacheConverter (FO_Present_Types format_out,
+                    void       *converter_obj,
+                    URL_Struct *URL_s,
+                    MWContext  *window_id);
+
+/* remove a URL from the memory cache
+ */
+extern void
+NET_RemoveURLFromMemCache(URL_Struct *URL_s);
+
+/* set or unset a lock on a memory cache object
+ */
+extern void
+NET_ChangeMemCacheLock(URL_Struct *URL_s, PRBool set);
+
+/* Create a wysiwyg cache converter to a copy of the current entry for URL_s.
+ */
+extern NET_StreamClass *
+net_CloneWysiwygMemCacheEntry(MWContext *window_id, URL_Struct *URL_s,
+			      uint32 nbytes, const char * wysiwyg_url,
+			      const char * base_href);
+/* return the first cache object in memory */
+extern net_CacheObject * 
+NET_FirstMemCacheObject(XP_List* list_ptr);
+
+/* return the next cache object in memory */
+extern net_CacheObject * 
+NET_NextMemCacheObject(XP_List* list_ptr);
+
+#endif /* MK_MEMORY_CACHE_H */

mozilla/network/cache/netcache.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef NETCACHE_H
+#define NETCACHE_H
+
+#include "mkgeturl.h"
+
+PR_BEGIN_EXTERN_C
+
+/* Initialization */
+extern void     NET_CacheInit(void);
+/* Shutdown */
+extern void     NET_CleanupCache(void); 
+
+/* create an HTML stream and push a bunch of HTML about
+ * the cache
+ */
+extern void     NET_DisplayCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+/* create an HTML stream and push a bunch of HTML about
+ * the memory cache - TODO consolidate these two into one function! - Gagan
+ */
+extern void     NET_DisplayMemCacheInfoAsHTML(ActiveEntry * cur_entry);
+
+extern int      NET_FindURLInCache(URL_Struct * URL_s, MWContext *ctxt);
+
+#ifdef NU_CACHE
+extern void     NET_InitNuCacheProtocol(void);
+#else
+extern void     NET_InitMemCacProtocol(void);
+#endif
+
+/* Will go away later */
+extern PRBool   NET_IsCacheTraceOn(void);
+
+/* return TRUE if the URL is in the cache and
+ * is a partial cache file - TODO- only used in HTTP- cleanup - Gagan 
+ */ 
+extern PRBool   NET_IsPartialCacheFile(URL_Struct *URL_s);
+
+/* Update cache entry on a 304 return*/
+extern void     NET_RefreshCacheFileExpiration(URL_Struct * URL_s);
+
+/* remove a URL from the cache */
+extern void     NET_RemoveURLFromCache(URL_Struct *URL_s);
+
+/* Removed in NU_Cache, SAR should go through new api. - Gagan */
+#ifndef NU_CACHE
+extern void     NET_OpenExtCacheFAT(MWContext *ctxt, char * cache_name, char * instructions);
+extern void     CACHE_CloseAllOpenSARCache();
+extern void     CACHE_OpenAllSARCache();
+extern int      NET_FindURLInMemCache(URL_Struct * URL_s, MWContext *ctxt);
+/* lookup routine
+ *
+ * builds a key and looks for it in the database.  Returns an access
+ * method and sets a filename in the URL struct if found
+ */
+extern int      NET_FindURLInExtCache(URL_Struct * URL_s, MWContext *ctxt);
+#endif
+
+PR_END_EXTERN_C
+
+#endif /* NETCACHE_H */

mozilla/network/cache/nu/Makefile

@@ -0,0 +1,26 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH	= ../../..
+
+DIRS	= public src 
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk

mozilla/network/cache/nu/include/Makefile

@@ -0,0 +1,24 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH	= ../../../..
+
+MODULE	= cache
+
+include $(DEPTH)/config/rules.mk

mozilla/network/cache/nu/include/makefile.win

@@ -0,0 +1,18 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+!include $(MOZ_SRC)\ns\config\rules.mak

mozilla/network/cache/nu/include/nsCacheTrace.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef _nsCacheTrace_H_
+#define _nsCacheTrace_H_
+/* 
+* nsCacheTrace
+*
+* Gagan Saksena
+* 02/02/98
+* 
+*/
+#ifndef CRLF
+#	define CRLF "\r\n"
+#endif
+
+#include "prtypes.h"
+#include "prlog.h"
+
+class nsCacheTrace 
+{
+
+public:
+		nsCacheTrace(void);
+    static void Enable(PRBool bEnable);
+    static PRBool IsEnabled(void);
+    static void	Trace(const char* msg);
+    static void	Traceln(const char* msg);
+    static void Use(char* buffer);
+    static char* m_TraceBuffer;
+private:
+    PRBool m_bEnabled;
+};
+
+inline void nsCacheTrace::Trace(const char* msg) 
+{
+	PR_ASSERT(msg);
+    //Do log stuff here TODO
+}
+
+inline void nsCacheTrace::Traceln(const char* msg)
+{
+	Trace(msg);
+	Trace(CRLF);
+}
+
+inline void nsCacheTrace::Use(char* buffer) 
+{
+	m_TraceBuffer = buffer;
+}
+#endif

mozilla/network/cache/nu/include/nsFFEntry.h

@@ -0,0 +1,132 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFFEntry_h__
+#define nsFFEntry_h__
+
+#include "nsFFObject.h"
+//#include "nsISupports.h"
+/** An FFEntry consists of several objects, all io takes place 
+  * through the FFEntry's read and write functions */
+
+class nsFFEntry//: public nsISupports
+{
+
+public:
+            nsFFEntry();
+            nsFFEntry(const PRUint32 i_ID);
+            //Single block entries can use this constructor
+            nsFFEntry(const PRUint32 i_ID, const PRUint32 i_offset, const PRUint32 i_size);
+    virtual ~nsFFEntry();
+
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+
+    PRBool      AddObject(const nsFFObject* i_object);
+
+    //Appends an entry to the list
+    PRBool      AddEntry(const nsFFEntry* i_pEntry);
+
+    nsFFObject* FirstObject(void) const;
+    void        FirstObject(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFEntry*  NextEntry(void) const;
+    void        NextEntry(const nsFFEntry* i_pEntry);
+
+    //Returns the number of objects in this entry. 
+    PRUint32    Objects(void) const;
+
+    PRBool      Remove(void);
+
+    PRUint32    Size(void) const;
+
+protected:
+
+private:
+    nsFFEntry(const nsFFEntry& o);
+    nsFFEntry& operator=(const nsFFEntry& o);
+
+    nsFFObject* m_pFirstObject;
+    nsFFEntry* m_pNextEntry;
+
+    PRUint32 m_ID;
+    PRUint32 m_Objects;
+};
+
+inline
+PRBool nsFFEntry::AddEntry(const nsFFEntry* i_Entry)
+{
+    if (!i_Entry)
+        return PR_FALSE;
+    if (m_pNextEntry)
+        return m_pNextEntry->AddEntry(i_Entry);
+    m_pNextEntry = (nsFFEntry*) i_Entry;
+    return PR_TRUE;
+}
+
+inline
+nsFFObject* nsFFEntry::FirstObject(void) const
+{
+    return m_pFirstObject;
+}
+
+inline
+PRUint32 nsFFEntry::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFEntry::ID(const PRUint32 i_id)
+{
+    m_ID = i_id;
+}
+
+inline
+nsFFEntry* nsFFEntry::NextEntry(void) const
+{
+    return m_pNextEntry;
+}
+
+inline
+void nsFFEntry::NextEntry(const nsFFEntry* i_pEntry)
+{
+    m_pNextEntry = (nsFFEntry*) i_pEntry;
+}
+
+inline
+PRUint32 nsFFEntry::Objects(void) const
+{
+    return m_Objects;
+}
+
+inline
+PRUint32 nsFFEntry::Size(void) const
+{
+    return m_pFirstObject ? m_pFirstObject->TotalSize() : 0; // Assumption that there is no zero length files //TODO
+}
+
+#endif // nsFFEntry_h__
+

mozilla/network/cache/nu/include/nsFFObject.h

@@ -0,0 +1,125 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFFObject_h__
+#define nsFFObject_h__
+
+#include "prtypes.h"
+
+class nsFFObject
+{
+
+public:
+            nsFFObject(
+                PRUint32 i_ID, 
+                PRUint32 i_Offset, 
+                PRUint32 i_Size = 0);
+
+    virtual ~nsFFObject();
+
+    PRBool      Add(const nsFFObject* i_object);
+
+    PRUint32    ID(void) const;
+    void        ID(const PRUint32 i_ID);
+
+    nsFFObject* Next(void) const;
+    void        Next(nsFFObject* io_pNext);
+
+    PRUint32    Offset(void) const;
+    void        Offset(const PRUint32 i_offset);
+
+    PRUint32    Size(void) const;
+    void        Size(const PRUint32 i_Size);
+
+    PRUint32    TotalSize(void) const;
+
+protected:
+
+private:
+    nsFFObject(const nsFFObject& o);
+    nsFFObject& operator=(const nsFFObject& o);
+    
+    PRUint32 m_ID;
+    PRUint32 m_Offset;
+    PRUint32 m_Size;
+
+    nsFFObject* m_pNext;
+};
+
+inline
+PRUint32 nsFFObject::ID(void) const
+{
+    return m_ID;
+}
+
+inline
+void nsFFObject::ID(const PRUint32 i_ID)
+{
+    m_ID = i_ID;
+}
+
+inline
+nsFFObject* nsFFObject::Next(void) const
+{
+    return m_pNext;
+}
+
+inline 
+void nsFFObject::Next(nsFFObject* io_pNext)
+{
+    if (io_pNext)
+        io_pNext->ID(m_ID);
+    m_pNext = io_pNext;
+    // Overlap check! //TODO
+    //PR_ASSERT(io_pNext->Offset() > m_Offset + m_Size) ||
+        // (io_pNext->Offset() + io_pNext->Size() < m_Offset)
+}
+
+inline
+PRUint32 nsFFObject::Offset(void) const
+{
+    return m_Offset;
+}
+
+inline
+void nsFFObject::Offset(const PRUint32 i_Offset)
+{
+    m_Offset = i_Offset;
+    //TODO - overlap check. 
+}
+
+inline
+PRUint32 nsFFObject::Size(void) const
+{
+    return m_Size;
+}
+
+inline
+void nsFFObject::Size(const PRUint32 i_Size)
+{
+    m_Size = i_Size;
+    //TODO - Overlap check. 
+}
+
+inline 
+PRUint32 nsFFObject::TotalSize(void) const
+{
+    return m_Size + (m_pNext ? m_pNext->TotalSize() : 0);
+}
+#endif // nsFFObject_h__
+

mozilla/network/cache/nu/include/nsFlatFile.h

@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFlatFile_h__
+#define nsFlatFile_h__
+
+#include "prtypes.h"
+#include "prio.h"
+
+//#include "nsISupports.h"
+
+#ifdef IS_LITTLE_ENDIAN
+#ifndef COPY_INT32
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+#endif
+
+/** A class to handle flat file storage mechanism */
+static const PRUint32 kPAGE_SIZE =4096; 
+
+class nsFlatFile //: public nsISupports
+{
+public:
+
+            nsFlatFile(const char* i_pFilename, 
+                const PRUint32 i_FileSize= 5242880); // 5 meg
+            // TODO think if we want to substract the toc size from this?
+
+    virtual ~nsFlatFile();
+
+    const char*     Filename(void) const;
+
+    PRUint32        HeaderSize(void) const;
+
+    void            Init(void);
+
+    PRBool          IsValid(void) const;
+    
+    PRUint32        Size(void) const;
+    /*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+    */
+protected:
+
+private:
+    nsFlatFile(const nsFlatFile& o);
+    nsFlatFile& operator=(const nsFlatFile& o);
+
+    PRBool      m_bIsValid;
+    char*       m_pFilename;
+    PRUint32    m_Size;
+
+    PRFileDesc* m_pFD;
+    PRUint32    m_HeaderSize;
+};
+
+inline
+const char* nsFlatFile::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+PRUint32 nsFlatFile::HeaderSize(void) const
+{
+    return m_HeaderSize;
+}
+
+inline
+PRBool nsFlatFile::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsFlatFile::Size(void) const
+{
+    return m_Size;
+}
+#endif // nsFlatFile_h__
+

mozilla/network/cache/nu/include/nsTOC.h

@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsTOC_h__
+#define nsTOC_h__
+
+//#include "nsISupports.h"
+
+#include "nsFlatFile.h"
+#include "nsFFEntry.h"
+
+class nsTOC//: public nsISupports
+{
+
+public:
+            nsTOC(const char* i_pFilename, nsFlatFile* i_pFlatFile);
+    virtual ~nsTOC();
+/*
+    NS_IMETHOD              QueryInterface(const nsIID& aIID, 
+                                           void** aInstancePtr);
+    NS_IMETHOD_(nsrefcnt)   AddRef(void);
+    NS_IMETHOD_(nsrefcnt)   Release(void);
+*/
+
+    nsFFEntry*  AddEntry(PRUint32 i_size = kPAGE_SIZE);
+
+    PRUint32    Entries(void) const;
+
+    const char* Filename(void) const;
+    
+    nsFFEntry*  FirstDataEntry(void) const;
+    
+    nsFFEntry*  FreeEntry(void) const;
+
+    void        Init(void);
+
+    PRBool      IsValid(void) const;
+    
+protected:
+    PRUint32    NextID(void) const;
+    
+    PRBool      Serialize(nsFFEntry* io_Entry, PRBool bRead = PR_FALSE);
+    
+
+private:
+    nsTOC(const nsTOC& o);
+    nsTOC& operator=(const nsTOC& o);
+
+    nsFFEntry*      m_pContents; // The first entry is reserved for free space list
+    PRUint32        m_Entries;
+    char*           m_pFilename;
+    nsFlatFile*     m_pFlatFile;
+    PRFileDesc*     m_pFD;
+    PRBool          m_bIsValid;
+};
+
+inline
+PRUint32 nsTOC::Entries(void) const
+{
+    return m_Entries;
+}
+
+inline
+const char* nsTOC::Filename(void) const
+{
+    return m_pFilename;
+}
+
+inline
+nsFFEntry*  nsTOC::FirstDataEntry(void) const
+{
+    return m_pContents ? m_pContents->NextEntry() : 0;
+}
+    
+inline
+nsFFEntry* nsTOC::FreeEntry(void) const
+{
+    return m_pContents;
+}
+
+inline
+PRBool nsTOC::IsValid(void) const
+{
+    return m_bIsValid;
+}
+
+inline
+PRUint32 nsTOC::NextID(void) const
+{
+    return m_Entries + 1;
+}
+#endif // nsTOC_h__
+

mozilla/network/cache/nu/include/nsTimeIt.h

@@ -0,0 +1,25 @@
+/* A class to time excursion events */
+/* declare an object of this class within the scope to be timed. */
+#include "prtypes.h"
+#include "prinrval.h"
+
+class nsTimeIt
+{
+public:
+    nsTimeIt(PRUint32& tmp);
+    ~nsTimeIt();
+private:
+    PRIntervalTime t;
+    PRUint32& dest;
+};
+
+inline
+nsTimeIt::nsTimeIt(PRUint32& tmp):t(PR_IntervalNow()), dest(tmp)
+{
+}
+
+inline
+nsTimeIt::~nsTimeIt()
+{
+    dest = PR_IntervalToMicroseconds(PR_IntervalNow()-t);
+}