This commit was manufactured by cvs2svn to create tag 'STABLE'.

git-svn-id: svn://10.0.0.236/tags/STABLE@39047 18797224-902f-48f8-a5cc-f745e15eee43

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/webtools/tinderbox/Backwards.pm

@@ -0,0 +1,216 @@
+# Backwards.pm
+
+# Copyright (C) 1999 Uri Guttman. All rights reserved.
+# mail bugs, comments and feedback to uri@sysarch.com
+
+
+use strict ;
+
+package Backwards ;
+
+use Symbol ;
+use Fcntl ;
+use Carp ;
+use integer ;
+
+#my $max_read_size = 3 ;
+
+my $max_read_size = 1 << 13 ;
+
+# support tied handles. the tied calls map directly to the object methods
+
+*TIEHANDLE = \&new ;
+*READLINE = \&readline ;
+
+# create a new Backwards object
+
+sub new {
+
+	my( $class, $filename ) = @_ ;
+
+	my( $handle, $seek_pos, $read_size, $self ) ;
+
+# get a new handle symbol and the real file handle
+
+	$handle = gensym() ;
+
+# open the file for reading
+
+	unless( sysopen( $handle, $filename, O_RDONLY ) ) {
+		carp "Can't open $filename $!" ;
+		return ;
+	}
+
+# seek to the end of the file
+
+	seek( $handle, 0, 2 ) ;
+	$seek_pos = tell( $handle ) ;
+
+# get the size of the first block to read,
+# either a trailing partial one (the % size) or full sized one (max read size)
+
+	$read_size = $seek_pos % $max_read_size || $max_read_size ;
+
+# create the hash for the object, bless and return it
+
+	$self = {
+			'file_name'	=> $filename,
+			'handle'	=> $handle,
+			'read_size'	=> $read_size,
+			'seek_pos'	=> $seek_pos,
+			'lines'		=> [],
+	} ;
+
+	return( bless( $self, $class ) ) ;
+}
+
+sub readline {
+
+	my( $self, $line_ref ) = @_ ;
+
+	my( $handle, $lines_ref, $seek_pos, $read_cnt, $read_buf,
+	    $file_size, $read_size, $text ) ;
+
+# get the buffer of lines
+
+	$lines_ref = $self->{'lines'} ;
+
+	while( 1 ) {
+
+# see if there is more than 1 line in the buffer
+
+		if ( @{$lines_ref} > 1 ) {
+
+# we have a complete line so return it
+
+			return( pop @{$lines_ref} ) ;
+		}
+
+# we don't have a complete, so have to read blocks until we do
+
+		$seek_pos = $self->{'seek_pos'} ;
+
+# see if we are at the beginning of the file
+
+		if ( $seek_pos == 0 ) {
+
+# the last read never made more lines, so return the last line in the buffer
+# if no lines left then undef will be returned
+
+			return( pop @{$lines_ref} ) ;
+		}
+
+#print "c size $read_size\n" ;
+
+# we have to read more text so get the handle and the current read size
+
+		$handle = $self->{'handle'} ;
+		$read_size = $self->{'read_size'} ;
+
+# after the first read, always read the maximum size
+
+		$self->{'read_size'} = $max_read_size ;
+
+# seek to the beginning of this block and save the new seek position
+
+		$seek_pos -= $read_size ;
+		$self->{'seek_pos'} = $seek_pos ;
+		seek( $handle, $seek_pos, 0 ) ;
+
+#print "seek $seek_pos\n" ;
+
+# read in the next (previous) block of text
+
+		$read_cnt = sysread( $handle, $read_buf, $read_size ) ;
+
+#print "Read <$read_buf>\n" ;
+
+#   if ( $read_cnt != $read_size ) {
+#   	print "bad read cnt $read_cnt != size $read_size\n" ;
+#	return( undef ) ;
+#   }
+
+# prepend the read buffer to the leftover (possibly partial) line
+
+		$text = $read_buf . ( pop @{$lines_ref} || '' ) ;
+
+# split the buffer into a list of lines
+# this may want to be $/ but reading files backwards assumes plain text and
+# newline separators
+
+		@{$lines_ref} = $text =~ m[(^.*\n|^.+)]mg ;
+
+#print "Lines \n=>", join( "<=\n=>", @{$lines_ref} ), "<=\n" ;
+	}
+}
+
+__END__
+
+
+=head1 NAME
+
+Backwards.pm -- Read a file backwards by lines.
+ 
+
+=head1 SYNOPSIS
+
+	use Backwards ;
+
+	# Object interface
+
+	$bw = Backwards->new( 'log_file' ) ;
+
+	while( $log_line = $bw->readline ) {
+		print $log_line ;
+	}
+
+	# Tied Handle Interface
+
+	tie *BW, 'log_file' ;
+
+	while( <BW> ) {
+		print ;
+	}
+
+=head1 DESCRIPTION
+ 
+
+This module reads a file backwards line by line. It is simple to use,
+memory efficient and fast. It supports both an object and a tied handle
+interface.
+
+It is intended for processing log and other similar text files which
+typically have new entries appended. It uses newline as the separator
+and not $/ since it is only meant to be used for text.
+
+It works by reading large (8kb) blocks of text from the end of the file,
+splits them on newlines and stores the other lines until the buffer runs
+out. Then it seeks to the previous block and splits it. When it reaches
+the beginning of the file, it stops reading more blocks.  All boundary
+conditions are handled correctly. If there is a trailing partial line
+(no newline) it will be the first line returned. Lines larger than the
+read buffer size are ok.
+
+=head2 Object Interface
+ 
+
+There are only 2 methods in Backwards' object interface, new and
+readline.
+
+=head2 new
+
+New takes just a filename for an argument and it either returns the
+object on a successful open on that file or undef.
+
+=head2 readline
+
+Readline takes no arguments and it returns the previous line in the file
+or undef when there are no more lines in the file.
+
+
+=head2 Tied Handle Interface
+
+The only tied handle calls supported are TIEHANDLE and READLINE and they
+are typeglobbed to new and readline respectively. All other tied handle
+operations will generate an unknown method error. Do not seek, write or
+do any other operation other than <> on the handle.

mozilla/webtools/tinderbox/Empty.html

@@ -0,0 +1 @@
+<font size=+2>Click on the <b>filename and line number</b> in the log and the source will appear in this window.</font>

mozilla/webtools/tinderbox/Makefile

@@ -0,0 +1,77 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+
+# This Makefile helps you install Tinderbox.  Define PERL and MYSQLTCL to
+# the full pathnames of where you have these utilities.  Define PREFIX
+# to where you will install the running Tinderbox.  Then "make install" should
+# copy things for you.
+
+#BONSAI = /home/httpd/html/bonsai
+#CVSROOT = /cvsroot
+#GZIP = /usr/bin/gzip
+#PERL = /usr/bin/perl
+#PREFIX = /home/httpd/html/tinderbox
+#UUDECODE = /usr/bin/uudecode
+
+FILES = addimage.cgi	\
+addnote.cgi	\
+admintree.cgi	\
+buildwho.pl	\
+clean.pl	\
+copydata.pl	\
+doadmin.cgi	\
+ep_mac.pl	\
+ep_unix.pl	\
+ep_windows.pl	\
+fixupimages.pl	\
+globals.pl	\
+handlemail.pl	\
+imagelog.pl	\
+processbuild.pl	\
+showbuilds.cgi	\
+showimages.cgi	\
+showlog.cgi	\
+Empty.html	\
+faq.html	\
+index.html	\
+examples/mozilla-unix.pl \
+examples/mozilla-windows.pl
+
+PICS = \
+1afi003r.gif	\
+reledanim.gif	\
+star.gif
+
+install:
+	mkdir -p $(PREFIX) && \
+	for I in $(FILES); do \
+	  echo Installing $$I && \
+          sed -e s#/usr/bonsaitools/bin/perl#$(PERL)#g \
+              -e s#/tools/ns/bin/perl5#$(PERL)#g \
+              -e s#/m/src#$(CVSROOT)#g \
+              -e s#/usr/local/bin/gzip#$(GZIP)#g \
+              -e s#/tools/ns/bin/uudecode#$(UUDECODE)#g \
+              -e s#/d/webdocs/projects/bonsai#$(BONSAI)#g \
+              $$I > $(PREFIX)/$$I && \
+	chmod 755 $(PREFIX)/$$I; done && \
+	for I in $(PICS); do \
+	  echo Installing $$I && \
+	  cp -f $$I $(PREFIX) && \
+	  chmod 755 $(PREFIX)/$$I; done
+

mozilla/webtools/tinderbox/README

@@ -0,0 +1,287 @@
+This is Tinderbox.  See <http://www.mozilla.org/tinderbox.html>.
+
+
+	==========
+	DISCLAIMER
+	==========
+
+This is not very well packaged code.  It's not packaged at all.  Don't
+come here expecting something you plop in a directory, twiddle a few
+things, and you're off and using it.  Much work has to be done to get
+there.  We'd like to get there, but it wasn't clear when that would be,
+and so we decided to let people see it first.
+
+Don't believe for a minute that you can use this stuff without first
+understanding most of the code.
+
+
+	============
+	DEPENDENCIES
+	============
+
+To use tinderbox, you must first have bonsai up and running.
+See <http://www.mozilla.org/bonsai.html>.
+
+Be warned now that bonsai is not easily installed.
+
+
+	====================================
+	What's What in the Tinderbox sources:
+	====================================
+
+This is a rough first pass at cataloging and documenting the Tinderbox
+sources.  Many hands have been in this code over the years, and it has
+accreted wildly.  There is probably quite a lot of dead code in here.
+
+
+PROGRAMS
+========
+
+handlemail.pl   This is the mail deliverty agent (MDA) for tinderbox,
+                the local message transfer agent (MTA) calls this
+                program to deliver the tinderbox mail into the system.
+                It is a wrapper for processbuild.pl.
+
+processbuild.pl Update the "$tbx{tree}/build.dat" database as new
+                mail comes in then run "./buildwho.pl $tree" and
+                "./showbuilds.cgi" (to build static versions of 
+                tinderbox data.
+
+buildwho.pl     Update the who.dat file with the list of authors who
+                checked in in the last two days.  This is run from
+                processbuild.pl, always, and from showbuild.cgi when
+                'rebuildguilty' is clicked
+
+
+Conceptually, the three programs, handlemail.pl, processbuild.pl, and
+buildwho.pl, make up the MDA for tinderbox.
+
+
+showbuilds.cgi  Create the Tinderbox web page.  
+
+showlog.cgi     Show a build log (brief and full) update the brief_log if
+                necessary. Requires the ep_$form{errorparser}.pl error
+                parser.
+
+ep_unix.pl      Knows how to parse Unix build error logs.  Used by
+                processbuild.pl There needs to be one ep_* file for
+                each distinct parsing algorithm used, typically this
+                is per platform.  This file defines the regular
+                expressions which locate error lines: has_error()
+                has_warning() and the function has_errorline() which
+                parses the line into the global variables:
+                $error_file, $error_file_ref, $error_line, $error_guess,
+
+admintree.cgi   Displays the admin cgi which depends on:
+                $message_of_day, $ignore_builds
+
+doadmin.cgi     Actually do the work to admin a tinderbox tree 
+                (change message of the day, turn off displays for a
+                channel)
+
+clean.pl        Run `find . -name \"*.gz\" -mtime +7 -print ` and 
+                unlink those files.  Does not appear to be run from
+                other tools.  It is a good candidate for a cron job.
+
+
+
+OPTIONS to showbuilds.cgi
+=========================
+
+Options to showbuilds are specified in the URL and are undocumented
+elsewhere.
+
+If called with no 'tree' option display the possible build trees to
+pick from.  The 'tree' picks the build to display.  An additional tree
+can be specified with 'tree2'.
+
+Interesting visual params are:
+
+current state monitoring mode:
+          express=1
+        or
+          panel=1
+text mode state monitoring:
+        quickparse=1
+
+These modes do not show on my browser:
+        flash=1
+        rdf=1
+        static=1 
+
+These are self explanatory:
+        nocrap=1;  
+        hours=n; 
+
+
+EMAIL FORMAT
+============
+
+Each tinderbox client mails status updates to the tinderbox server.
+These mails contain special tinderbox data lines describing the
+progress of the build it may also contain the log of the build process
+and could contain a uuencoded binary.
+
+
+The email to the tinderbox server looks like:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: building
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+
+If binaryname is set then the mail message is run through uudecode to
+create a file called "$binaryname" on the tinderbox server.
+
+# NOT USED tinderbox: buildfamily: unix
+
+
+DATA STRUCTURES IN showbuilds.cgi 
+=================================
+
+load_buildlog() creates build_list a list of hash refernces of this
+type
+      $buildrec = {    
+         mailtime => $mailtime,
+         buildtime => $buildtime,
+         buildname => ($tree2 ne '' ? $t->{name} . ' ' : '' ) . $buildname,
+         errorparser => $errorparser,
+         buildstatus => $buildstatus,
+         logfile => $logfile,
+         binaryname => $binaryname,
+         td => $t
+      };
+
+the $buildrec->{rowspan} variable holds the number of rows that the build
+should occupy on the table and is not stored in the build.dat file.
+
+These are other add ons to the data structure
+$buildrec->{hasnote}=1;
+$buildrec->{noteid} = (0+@note_array);
+
+commonly  buildrec's are accessed through:
+$build_table->[$build_time][$build_name] = $buildrec;
+
+The list of users who updated this build is stored as:
+$who_list->[$checkin_time]->{$author} = 1;
+
+There are numerous duplicate data structures which hold partial
+information:
+
+        hashes which hold all indices:
+            $build_name_index->{$br->{buildname}} = 1;
+            $build_time_index->{$br->{buildtime}} = 1;
+        other access into $build_table:
+            $build_name_names->[$i] = $n;
+            $build_time_times->[$i] = $n;
+
+
+loadquickparseinfo creates these references
+      $build->{$buildname} = $buildstatus;
+      $times->{$buildname} = $buildtime;
+
+    
+
+DATA FILES
+==========
+
+These files are used to store data structures.  They are a persistent
+store of data between executions of the same program and they pass the
+data between cooperating program.  This data is often databases with
+rows separated by "\n" and columns by '|'.
+
+
+$tree/${logfile}
+$tree/${logfile}.brief.html
+$tree/ignorebuilds.pl
+$tree/mod.pl
+$tree/notes.txt
+$tree/treedata.pl
+$tree/who.dat
+$treename/build.dat
+
+The logfile that the tinderbox client sent stored in gziped format.
+The filename is ${tree}/$builddate.$$.gz so its quite random and does
+not depend on the clients$build string and multiple logs are kept for
+each build, one for each mail message sent.
+
+The brief.html file is a cache of the error log summary for this log
+file and is recreated when the logfile gets updated.
+
+ignorebuilds.pl is a file which specifies builds that should not be
+performed.  It is valid perl code which sets the hash reference
+$ignore_builds, each key is a tree name.
+
+mod.pl stores the tree specific message of the day.  This is not to be
+       confused with mod perl the CGI library. Its contents looks like:
+        $message_of_day = 'message';
+
+notes.txt store the database of notes:
+$buildtime|$buildname||$author|$time_now|$note 
+
+
+treedata.pl stores the cvs information pertaining to this tree and
+                looks like this:
+        $cvs_module='$modulename';
+        $cvs_branch='$branchname';
+        $cvs_root='$repository';
+
+who.dat file has lines like:
+            $checkin_time|$author
+        This gets stored in the data structure, where checkin_time
+        gets fudged up so that is is a time already in the
+        build_table:
+                      $who_list->[$checkin_time]->{$author} = 1;
+ 
+build.dat stores the build results table.  It is a flat file
+                representation of $build_table
+
+build.dat is a database file each row is a build and has pipe
+separated columns: 
+
+1) the time stamp of the tinderbox server 
+2) time stamp of the build machine 
+3) the official build name (should include build machine name)
+   ( note: that 2 & 3 together uniquely identify the build 
+        and all relevant build data)
+4) the architecture dependent error parser to use on the log files
+5) status of the build (success|busted|building|testfailed)
+6) The log file for this build (if completed)
+7) the name of the binary (if any) that came from the build
+
+
+Other Files
+====================
+1afi003r.gif	The "flames" animation used by showbuilds.cgi
+
+Empty.html	Document used for an empty frame by ???
+
+addimage.cgi	The form that lets you add a new image to the list of
+		images that Tinderbox picks from randomly.
+
+addnote.cgi	Add a note to a build log.
+
+admintree.cgi	Lets you perform various admin tasks on a Tinderbox tree.
+		This just prompts for a password and posts to doadmin.cgi.
+
+clean.pl	???
+copydata.pl	???
+
+doadmin.cgi	Actually do the work to admin a tinderbox tree 
+
+ep_mac.pl	Knows how to parse Mac build error logs.  Used by ???
+ep_unix.pl	Knows how to parse Unix build error logs.  Used by ???
+ep_windows.pl	Knows how to parse Windows build error logs.  Used by ???
+
+faq.html	Wildly out of date.
+
+fixupimages.pl	???
+globals.pl	???
+imagelog.pl	???
+index.html	???
+reledanim.gif	???
+
+showimages.cgi	Show all the images in the Tinderbox list.  Password-protected.
+
+star.gif	The "star" image used to annotate builds by ???

mozilla/webtools/tinderbox/addimage.cgi

@@ -0,0 +1,404 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use Socket;
+
+use lib "../bonsai";
+require 'header.pl';
+
+print "Content-type: text/html\n\n";
+
+EmitHtmlTitleAndHeader("tinderbox: add images", "add images");
+
+$| = 1;
+
+require "globals.pl";
+require "imagelog.pl";
+
+&split_cgi_args;
+
+
+sub Error {
+    my ($msg) = @_;
+    print "<BR><BR><BR>";
+    print "<UL><FONT SIZE='+1'><B>Something went wrong:</B><P>";
+    print "<UL>";
+    print $msg;
+    print "</UL>";
+    print "<P>";
+    print "Hit <B>\`Back'</B> and try again.";
+    print "</UL>";
+    exit 1;
+}
+
+
+if( $url = $form{"url"} ){
+    $quote = $form{"quote"};
+
+    $quote =~ s/[\r\n]/ /g;
+    $url =~ s/[\r\n]/ /g;
+
+    $width = "";
+    $height = "";
+# I think we don't want to allow this --jwz
+#    $width = $form{"width"};
+#    $height = $form{"height"};
+
+    if ($width eq "" || $height eq "") {
+        $size = &URLsize($url);
+        if ($size =~ /WIDTH=([0-9]*)/) {
+            $width = $1;
+        }
+        if ($size =~ /HEIGHT=([0-9]*)/) {
+            $height = $1;
+        }
+        if ($width eq "" || $height eq "") {
+            Error "Couldn't get image size for \"$url\".\n";
+        }
+    }
+
+    print " 
+    
+<P><center><img border=2 src='$url' width=$width height=$height><br>
+<i>$quote</i><br><br>
+";
+
+    if( $form{"submit"} ne "Yes" ){
+        my $u2 = $url;
+        my $q2 = $quote;
+        $u2 =~ s@&@&amp;@g; $u2 =~ s@<@&lt;@g; $u2 =~ s@\"@&quot;@g;
+        $q2 =~ s@&@&amp;@g; $q2 =~ s@<@&lt;@g; $q2 =~ s@\"@&quot;@g;
+
+        print "
+<form action='addimage.cgi' METHOD='get'>
+<input type=hidden name=url value=\"$u2\">
+<input type=hidden name=quote value=\"$q2\">
+<HR>
+<TABLE>
+ <TR>
+  <TH ALIGN=RIGHT NOWRAP>Image URL:</TH>
+  <TD><TT><B>$u2</B></TT></TD>
+ </TR><TR>
+  <TH ALIGN=RIGHT>Caption:</TH>
+  <TD><TT><B>$q2</B></TT></TD>
+ </TR>
+ <TR>
+  <TD></TD>
+  <TD>
+   <FONT SIZE=+2><B>
+   Does that look right?
+   <SPACER SIZE=10>
+   <INPUT Type='submit' name='submit' value='Yes'>
+   </B><BR>(If not, hit \`Back' and fix it.)
+   </FONT>
+ </TD>
+</TABLE>
+</form>
+";
+    }
+    else {
+        &add_imagelog( $url, $quote, $width, $height );
+        print "<br><br>
+        <font size=+2>Has been added</font><br><br>
+        <a href=showbuilds.cgi>Return to Log</a>";
+    }
+
+}
+else {
+    print "
+<h2>Add an image and a funny caption.</h2>
+
+<ul>
+<p>This is about fun, and making your daily excursion to 
+<A HREF=http://www.mozilla.org/tinderbox.html>Tinderbox</A> a
+novel experience.  Engineers spend a lot of time here; it might as well
+have some entertainment value.
+
+<p>Please play nice. We don't have the time or inclination to look at
+everything you people submit, but if we get nastygrams or legalgrams
+and have to take something down, we will curse your IP address, and you
+might even make it so the whole thing goes away forever. Please don't
+make us go there. You might also avoid links to big images or slow
+servers.  
+
+<p><ul><B>Thank you for playing nice.</B></UL>
+
+<p>If you really find an image offensive, please
+<A HREF=mailto:terry\@netscape.com?Subject=offensive%20tinderbox%20image>tell us</A>
+nicely before someone causes a stink.  Be sure to include the URL of
+the image.  Remember, we don't screen these submissions and may not
+have even seen it.
+
+<p><ul><B>P.S. Please, no more pictures of Bill Gates.</B></UL>
+</ul>
+
+<p><form action='addimage.cgi' METHOD='get'>
+<TABLE>
+ <TR>
+  <TH ALIGN=RIGHT NOWRAP>Image URL:</TH>
+  <TD><INPUT NAME='url' SIZE=60></TD>
+ </TR><TR>
+  <TH ALIGN=RIGHT>Caption:</TH>
+  <TD><INPUT NAME='quote' SIZE=60></TD>
+ </TR><TR>
+  <TD></TD>
+  <TD><B>
+   <INPUT Type='submit' name='submit' value='Test'>
+   <SPACER SIZE=25>
+   <INPUT Type='reset' name='reset' value='Reset'>
+  </B></TD>
+ </TR>
+</TABLE>
+
+</form>
+<br><br>
+";
+}
+
+sub split_cgi_args {
+    local($i,$var,$value, $s);
+
+    $s = $ENV{"QUERY_STRING"};
+
+    @args= split(/\&/, $s );
+
+    for $i (@args) {
+        ($var, $value) = split(/=/, $i);
+        $value =~ tr/+/ /;
+        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+        $form{$var} = $value;
+    }
+}
+
+
+#sub imgsize {
+#    local($file)= @_;
+#
+#    #first try to open the file
+#    if( !open(STREAM, "<$file") ){
+#        Error "Can't open IMG $file"; 
+##        $size="";
+#    } else {
+#        if ($file =~ /.jpg/i || $file =~ /.jpeg/i) {
+#            $size = &jpegsize(STREAM);
+#        } elsif($file =~ /.gif/i) {
+#            $size = &gifsize(STREAM);
+#        } elsif($file =~ /.xbm/i) {
+#            $size = &xbmsize(STREAM);
+#        } else {
+#           return "";
+#        }
+#        $_ = $size;
+#        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+#            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+#        }
+#        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+#            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+#        }
+#        close(STREAM);
+#    }
+#    return $size;
+#}
+
+###########################################################################
+# Subroutine gets the size of the specified GIF
+###########################################################################
+
+# bug: it thinks that 
+# http://cvs1.mozilla.org/webtools/tinderbox/data/knotts.gif
+# is 640x400, but it's really 200x245.
+# giftrans says of that image:
+#
+#   Header: "GIF87a"
+#   Logical Screen Descriptor:
+#       Logical Screen Width: 640 pixels
+#       Logical Screen Height: 480 pixels
+#   Image Descriptor:
+#       Image Width: 200 pixels
+#       Image Height: 245 pixels
+
+
+sub gifsize {
+    local($GIF) = @_;
+    read($GIF, $type, 6); 
+    if(!($type =~ /GIF8[7,9]a/) || 
+       !(read($GIF, $s, 4) == 4) ){
+        Error "Invalid or Corrupted GIF"; 
+        $size="";
+    } else {
+        ($a,$b,$c,$d)=unpack("C"x4,$s);
+        $size=join ("", 'WIDTH=', $b<<8|$a, ' HEIGHT=', $d<<8|$c);
+    }
+    return $size;
+}
+
+sub xbmsize {
+    local($XBM) = @_;
+    local($input)="";
+
+    $input .= <$XBM>;
+    $input .= <$XBM>;
+    $_ = $input;
+    if( /#define\s*\S*\s*\d*\s*\n#define\s*\S*\s*\d*\s*\n/i ){
+       ($a,$b)=/#define\s*\S*\s*(\d*)\s*\n#define\s*\S*\s*(\d*)\s*\n/i;
+       $size=join ("", 'WIDTH=', $a, ' HEIGHT=', $b );
+   } else {
+       Error "Doesn't look like an XBM file";
+   }
+    return $size;
+}
+
+# jpegsize : gets the width and height (in pixels) of a jpeg file
+# Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
+# modified slightly by alex@ed.ac.uk
+sub jpegsize {
+    local($JPEG) = @_;
+    local($done)=0;
+    $size="";
+
+    read($JPEG, $c1, 1); read($JPEG, $c2, 1);
+    if( !((ord($c1) == 0xFF) && (ord($c2) == 0xD8))){
+        my $s = sprintf "This is not a JPEG! (Codes %02X %02X)\n", ord($c1), ord($c2);
+        Error $s;
+        $done=1;
+    }
+    while (ord($ch) != 0xDA && !$done) {
+        # Find next marker (JPEG markers begin with 0xFF)
+        # This can hang the program!!
+        while (ord($ch) != 0xFF) {  read($JPEG, $ch, 1); }
+        # JPEG markers can be padded with unlimited 0xFF's
+        while (ord($ch) == 0xFF) { read($JPEG, $ch, 1); }
+        # Now, $ch contains the value of the marker.
+            $marker=ord($ch);
+
+            if (($marker >= 0xC0) && ($marker <= 0xCF) &&
+            ($marker != 0xC4) && ($marker != 0xCC)) {  # it's a SOFn marker
+            read ($JPEG, $junk, 3); read($JPEG, $s, 4);
+            ($a,$b,$c,$d)=unpack("C"x4,$s);
+            $size=join("", 'HEIGHT=',$a<<8|$b,' WIDTH=',$c<<8|$d );
+            $done=1;
+        } else {
+            # We **MUST** skip variables, since FF's within variable 
+            # names are NOT valid JPEG markers
+            read ($JPEG, $s, 2); 
+            ($c1, $c2) = unpack("C"x2,$s); 
+            $length = $c1<<8|$c2;
+            if( ($length < 2) ){
+                Error "Bad JPEG file: erroneous marker length";
+                $done=1;
+            } else {
+                read($JPEG, $junk, $length-2);
+            }
+        }
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine grabs a gif from another server and gets its size
+###########################################################################
+
+
+sub URLsize {
+    my ($fullurl) = @_;
+
+    $_ = $fullurl;
+    if ( ! m@^http://@ ) {
+        Error "HTTP URLs only, please: \"$_\" is no good.";
+    }
+
+    my($dummy, $dummy, $serverstring, $url) = split(/\//, $fullurl, 4);
+    my($them,$port) = split(/:/, $serverstring);
+    my $port = 80 unless $port;
+    my $size="";
+
+    $_ = $them;
+    if ( m@^[^.]*$@ ) {
+        Error "Fully-qualified host names only, please: \"$_\" is no good.";
+    }
+
+    $_=$url;
+    my ($remote, $iaddr, $paddr, $proto, $line);
+    $remote = $them;
+    if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
+    die "No port" unless $port;
+    $iaddr   = inet_aton($remote)               || die "no host: $remote";
+    $paddr   = sockaddr_in($port, $iaddr);
+
+    $proto   = getprotobyname('tcp');
+    socket(S, PF_INET, SOCK_STREAM, $proto)  || die "socket: $!";
+    connect(S, $paddr)    || die "connect: $!";
+    select(S); $| = 1; select(STDOUT);
+
+    print S "GET /$url HTTP/1.0\r\n";
+    print S "Host: $them\r\n";
+    print S "User-Agent: Tinderbox/0.0\r\n";
+    print S "\r\n";
+
+    $_ = <S>;
+    if (! m@^HTTP/[0-9.]+ 200@ ) {
+        Error "$them responded:<BR> $_";
+    }
+
+    my $ctype = "";
+    while (<S>) {
+        # print "read: $_<br>\n";
+        if ( m@^Content-Type:[ \t]*([^ \t\r\n]+)@io ) {
+            $ctype = $1;
+        }
+        last if (/^[\r\n]/);
+    }
+
+    $_ = $ctype;
+    if ( $_ eq "" ) {
+        Error "Server returned no content-type for \"$fullurl\"?";
+    } elsif ( m@image/jpeg@i || m@image/pjpeg@i ) {
+        $size = &jpegsize(S);
+    } elsif ( m@image/gif@i ) {
+        $size = &gifsize(S);
+    } elsif ( m@image/xbm@i || m@image/x-xbm@i || m@image/x-xbitmap@i ) {
+        $size = &xbmsize(S);
+    } else {
+        Error "Not a GIF, JPEG, or XBM: that was of type \"$ctype\".";
+    }               
+
+    $_ = $size;
+    if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+        ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+    }
+    if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+        ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+    }
+
+    if ( $newwidth eq "" || $newheight eq "" ) {
+        return "";
+    } else {
+        if ( $newwidth <= 5 || $newheight <= 5 ) {
+            Error "${newwidth}x${newheight} seems small, don't you think?";
+        } elsif ( $newwidth >= 400 || $newheight >= 400 ) {
+            Error "${newwidth}x${newheight} is too big; please" .
+                " keep it under 400x400."
+        }
+        return $size;
+    }
+}
+
+sub dokill {
+    kill 9,$child if $child;
+}

mozilla/webtools/tinderbox/addnote.cgi

@@ -0,0 +1,206 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+use Fcntl;
+
+require "globals.pl";
+require 'lloydcgi.pl';
+
+if (defined($args = $form{log})) {
+
+  ($tree, $logfile) = split /\//, $args;
+
+  my $br = find_build_record($tree, $logfile);
+  $errorparser = $br->{errorparser};
+  $buildname   = $br->{buildname};
+  $buildtime   = $br->{buildtime};
+} else {
+  $tree        = $form{'tree'};
+  $logfile     = $form{'logfile'};
+  $errorparser = $form{'errorparser'};
+  $buildname   = $form{'buildname'};
+  $buildtime   = $form{'buildtime'};
+}
+
+$enc_buildname = &url_encode($buildname);
+
+$note = $form{'note'};
+$who  = $form{'who'};
+
+$now = time;
+$now_str = &print_time($now);
+
+$|=1;
+
+if( -r "$tree/ignorebuilds.pl" ){
+     require "$tree/ignorebuilds.pl";
+ }
+
+print "Content-Type:text/html\n";
+if ($ENV{"REQUEST_METHOD"} eq 'POST' && defined($form{'note'})) {
+    # Expire the cookie 5 months from now
+    print "Set-Cookie: email=$form{who}; expires="
+        . toGMTString(time + 86400 * 152) . "; path=/\n";
+}     
+print "\n<HTML>\n";
+
+if( $url = $form{"note"} ){
+
+    $note =~ s/\&/&amp;/gi;
+    $note =~ s/\</&lt;/gi;
+    $note =~ s/\>/&gt;/gi;
+    $enc_note = url_encode( $note );
+
+    open( NOTES,">>$tree/notes.txt");
+    flock(NOTES, LOCK_EX);
+    print NOTES "$buildtime|$buildname|$who|$now|$enc_note\n"; 
+
+       &LoadBuildTable;
+
+    foreach $element (keys %form) {
+
+          if(exists ${$build_name_index}{$element}) {
+             print NOTES "${$build_name_index}{$element}|$element|$who|$now|$enc_note\n"; 
+          } #EndIf
+    } #Endforeach
+    close(NOTES);
+
+    print "<H1>The following comment has been added to the log</h1>\n";
+
+    #print "$buildname \n $buildtime \n $errorparser \n $logfile \n  $tree \n $enc_buildname \n";
+    print "<pre>\n[<b>$who - $now_str</b>]\n$note\n</pre>";
+
+    print"
+<p><a href=\"showlog.cgi?tree=$tree\&buildname=$enc_buildname\&buildtime=$buildtime\&logfile=$logfile\&errorparser=$errorparser\">
+Go back to the Error Log</a>
+<a href=\"showbuilds.cgi?tree=$tree\">
+<br>Go back to the build Page</a>";
+
+  # Build tinderbox static pages
+  $ENV{QUERY_STRING}="tree=$tree&static=1";
+  $ENV{REQUEST_METHOD}="GET";
+  system './showbuilds.cgi >/dev/null';
+
+} else {
+
+  &GetBuildNameIndex;
+
+  @names = sort (keys %$build_name_index);
+
+  if ($buildname eq '' || $buildtime == 0) {
+    print "<h1>Invalid parameters</h1>\n";
+    die "\n";
+  }
+
+#print "$buildname \n $buildtime \n $errorparser \n $logfile \n  $tree \n $enc_buildname \n";
+
+$emailvalue = '';
+$emailvalue = " value='$cookie_jar{email}'" if defined($cookie_jar{email});
+
+print qq(
+<head><title>Add a Comment to $buildname log</title></head>
+<body BGCOLOR="#FFFFFF" TEXT="#000000"LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
+
+<table><tr><td>
+<b><font size="+2">Add a Log Comment</font></b>
+</td></tr><tr><td>
+<b><code>$buildname</code></b>
+</td></tr></table>
+
+<form action='addnote.cgi' METHOD='post'>
+
+<INPUT Type='hidden' name='buildname' value='${buildname}'>
+<INPUT Type='hidden' name='buildtime' value='${buildtime}'>
+<INPUT Type='hidden' name='errorparser' value='$errorparser'>
+<INPUT Type='hidden' name='logfile' value='$logfile'>
+<INPUT Type='hidden' name='tree' value='$tree'>
+
+<table border=0 cellpadding=4 cellspacing=1>
+<tr valign=top>
+  <td align=right>
+     <NOWRAP>Email address:</NOWRAP>
+  </td><td>
+     <INPUT Type='input' name='who' size=32$emailvalue><BR>
+  </td>
+</tr><tr valign=top>
+  <td align=right>
+     Comment:
+  </td><td>
+     <TEXTAREA NAME=note ROWS=10 COLS=30 WRAP=HARD></textarea>
+  </td>
+</tr>
+</table>
+<br><b><font size="+2">Addition Builds</font></b><br>
+(Comment will be added to the most recent cycle.)<br>
+);
+
+for $other_build (@names){
+    if( $other_build ne "" ){
+      
+      if (not exists ${$ignore_builds}{$other_build}) {
+        if( $other_build ne $buildname ){
+          print "<INPUT TYPE=checkbox NAME=\"$other_build\">";
+          print "$other_build<BR>\n";
+        }
+      } #EndIf
+    }
+} #Endfor
+
+print "<INPUT Type='submit' name='submit' value='Add Comment'><BR>
+</form>\n</body>\n</html>";
+}
+
+sub GetBuildNameIndex {
+local($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname);
+
+open(BUILDLOG, "$tree/build.dat") or die "Couldn't open build.dat: $!\n";
+
+while(<BUILDLOG>) {
+    chomp;
+    ($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname) = 
+         split( /\|/ );
+
+    $build_name_index->{$buildname} = 0;
+
+} #EndWhile
+close(BUILDLOG);
+
+}
+
+
+sub LoadBuildTable {
+local($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname);
+
+open(BUILDLOG, "$tree/build.dat") or die "Couldn't open build.dat: $!\n";
+
+while(<BUILDLOG>) {
+    chomp;
+    ($mailtime, $buildtime, $buildname, $errorparser, $buildstatus, $logfile, $binaryname) = 
+         split( /\|/ );
+
+    if ($buildtime > $build_name_index->{$buildname} ) {
+    $build_name_index->{$buildname} = $buildtime;
+    }
+
+} #EndWhile
+close(BUILDLOG);
+
+}
+

mozilla/webtools/tinderbox/admintree.cgi

@@ -0,0 +1,131 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'lloydcgi.pl';
+require 'globals.pl';
+require 'header.pl';
+
+$|=1;
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+EmitHtmlHeader("administer tinderbox", "tree: $tree");
+
+$form{noignore} = 1;            # Force us to load all build info, not
+                                # paying any attention to ignore_builds stuff.
+$maxdate = time();
+$mindate = $maxdate - 24*60*60;
+&load_data;
+
+if (defined($tree)) {
+    if( -r "$tree/mod.pl" ){
+        require "$tree/mod.pl";
+    }
+    else {
+        $message_of_day = "";
+    }
+
+    print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=set_message>
+<br><b>Message of the Day
+<br><TEXTAREA NAME=message ROWS=10 COLS=70 WRAP=SOFT>$message_of_day
+</TEXTAREA>
+<br><INPUT TYPE=SUBMIT VALUE='Set Message of the Day'>
+</FORM>
+<hr>
+";
+
+
+    print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=trim_logs>
+<br><b>Trim Logs to <INPUT NAME=days size=5 VALUE='7'> days.</b> (Tinderbox 
+shows 2 days history by default.  You can see more by clicking show all).
+<br><INPUT TYPE=SUBMIT VALUE='Trim Logs'>
+</FORM>
+<FORM method=post action=doadmin.cgi>
+<hr>
+"   ;
+}
+
+print "
+<FORM method=post action=doadmin.cgi>
+<B>Password:</B> <INPUT NAME=password TYPE=password> <BR>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=create_tree>
+<TABLE>
+<TR>
+<TD><B>tinderbox tree name:</B></TD>
+<TD><INPUT NAME=treename VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs repository:</B></TD>
+<TD><INPUT NAME=repository VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs module name:</B></TD>
+<TD><INPUT NAME=modulename VALUE=''></TD>
+</TR><TR>
+<TD><B>cvs branch:</B></TD>
+<TD><INPUT NAME=branchname VALUE='HEAD'></TD>
+</TR>
+</TABLE>
+<INPUT TYPE=SUBMIT VALUE='Create a new Tinderbox page'>
+</FORM>
+<FORM method=post action=doadmin.cgi>
+<hr>
+";
+
+if (defined($tree)) {
+    print "
+<B><font size=+1>If builds are behaving badly you can turn them off.</font></b><br>  Uncheck
+the build that is misbehaving and click the button.  You can still see all the
+builds even if some are disabled by adding the parameter <b><tt>&noignore=1</tt></b> to
+the tinderbox URL.<br>
+<B>Password:</B> <INPUT NAME=password TYPE=password> <BR>
+<INPUT TYPE=HIDDEN NAME=tree VALUE=$tree>
+<INPUT TYPE=HIDDEN NAME=command VALUE=disable_builds>
+";
+
+    @names = sort (@$build_name_names) ;
+
+    for $i (@names){
+        if( $i ne "" ){
+            $checked = ($ignore_builds->{$i} != 0 ? "": "CHECKED" );
+            print "<INPUT TYPE=checkbox NAME='build_$i' $checked >";
+            print "$i<br>\n";
+        }
+    }
+
+    print "
+<INPUT TYPE=SUBMIT VALUE='Show only checked builds'>
+</FORM>
+<hr>
+";
+}
+
+
+
+
+

mozilla/webtools/tinderbox/buildwho.pl

@@ -0,0 +1,97 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'globals.pl';
+
+$F_DEBUG=1;
+
+
+$days = 2;
+
+if ($ARGV[0] eq "-days") {
+    shift @ARGV;
+    $days = shift @ARGV;
+}
+
+$tree = $ARGV[0];
+
+open(SEMFILE, ">>$tree/buildwho.sem") || die "Couldn't open semaphore file!";
+if (!flock(SEMFILE, 2 + 4)) {   # 2 means "lock"; 4 means "fail immediately if
+                                # lock already taken".
+    print "buildwho.pl: Another process is currently building the database.\n";
+    exit(0);
+}
+
+require "$tree/treedata.pl";
+
+if( $cvs_root eq '' ){
+    $CVS_ROOT = '/m/src';
+}
+else {
+    $CVS_ROOT = $cvs_root;
+}
+
+$CVS_REPOS_SUFIX = $CVS_ROOT;
+$CVS_REPOS_SUFIX =~ s/\//_/g;
+    
+$CHECKIN_DATA_FILE = "/d/webdocs/projects/bonsai/data/checkinlog${CVS_REPOS_SUFIX}";
+$CHECKIN_INDEX_FILE = "/d/webdocs/projects/bonsai/data/index${CVS_REPOS_SUFIX}";
+
+require 'cvsquery.pl';
+
+print "cvsroot='$CVS_ROOT'\n";
+
+&build_who;
+
+flock(SEMFILE, 8);              # '8' is magic 'unlock' const.
+close SEMFILE;
+
+
+sub build_who {
+    open(BUILDLOG, "<$tree/build.dat" );
+    $line = <BUILDLOG>;
+    close(BUILDLOG);
+
+    #($j,$query_date_min) = split(/\|/, $line);
+    $query_date_min = time - (60 * 60 * 24 * $days);
+
+    if( $F_DEBUG ){
+        print "Minimum date: $query_date_min\n";
+    }
+
+    $query_module=$cvs_module;
+    $query_branch=$cvs_branch;
+
+    $result = &query_checkins;
+
+    
+    $last_who='';
+    $last_date=0;
+    open(WHOLOG, ">$tree/who.dat" );
+    for $ci (@$result) {
+        if( $ci->[$CI_DATE] != $last_date || $ci->[$CI_WHO] != $last_who ){
+            print WHOLOG "$ci->[$CI_DATE]|$ci->[$CI_WHO]\n";
+        }
+        $last_who=$ci->[$CI_WHO];
+        $last_date=$ci->[$CI_DATE];
+    }
+    close( WHOLOG );
+}

mozilla/webtools/tinderbox/bustagestats.cgi

@@ -0,0 +1,124 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use lib "../bonsai";
+
+require 'lloydcgi.pl';
+require 'globals.pl';
+require 'header.pl';
+
+use Date::Parse;
+use Date::Format;
+
+my $TIMEFORMAT = "%D %T";
+
+$|=1;
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+# &load_data;
+
+EmitHtmlHeader("Statistics");
+
+my $tree = $form{'tree'};
+my $start = $form{'start'};
+my $end = $form{'end'};
+
+sub str2timeAndCheck {
+    my ($str) = (@_);
+    my $result = str2time($str);
+    if (defined $result && $result > 7000000) {
+        return $result;
+    }
+    print "<p><font color=red>Can't parse as a date: $str</font><p>\n";
+    return 0;
+}
+
+if (defined $tree && defined $start && defined $end) {
+    my $first = str2timeAndCheck($start);
+    my $last = str2timeAndCheck($end);
+    if ($first > 0 && $last > 0) {
+        if (open(IN, "<$tree/build.dat")) {
+            print "<hr><center><h1>Bustage stats for $tree</H1><H3>from " .
+                time2str($TIMEFORMAT, $first) . " to " .
+                    time2str($TIMEFORMAT, $last) . "</H3></center>\n";
+            my %stats;
+            while (<IN>) {
+                chomp;
+                my ($mailtime, $buildtime, $buildname, $errorparser,
+                    $buildstatus, $logfile, $binaryname) = 
+                        split( /\|/ );
+                if ($buildtime >= $first && $buildtime <= $last) {
+                    if (!defined $stats{$buildname}) {
+                        $stats{$buildname} = 0;
+                    }
+                    if ($buildstatus eq "busted") {
+                        $stats{$buildname}++;
+                    }
+                }
+            }
+            print "<table>\n";
+            print "<tr><th>Build name</th><th>Number of bustages</th></tr>\n";
+            foreach my $key (sort (keys %stats)) {
+                print "<tr><td>$key</td><td>$stats{$key}</td></tr>\n";
+            }
+            print "</table>\n";
+        } else {
+            print "<p><font color=red>There does not appear to be a tree " .
+                "named '$tree'.</font><p>";
+        }
+        
+    }
+    print "<hr>\n";
+}
+
+if (!defined $tree) {
+    $tree = "";
+}
+
+if (!defined $start) {
+    $start = time2str($TIMEFORMAT, time() - 7*24*60*60); # One week ago.
+}
+
+if (!defined $end) {
+    $end = time2str($TIMEFORMAT, time()); # #now
+}
+
+
+print qq|
+<form>
+<table>
+<tr>
+<th align=right>Tree:</th>
+<td><input name=tree size=30 value="$tree"></td>
+</tr>
+<tr>
+<th align=right>Start time:</th>
+<td><input name=start size=30 value="$start"></td>
+</tr>
+<tr>
+<th align=right>End time:</th>
+<td><input name=end size=30 value="$end"></td>
+</tr>
+</table>
+
+<INPUT TYPE=\"submit\" VALUE=\"Generate stats \">
+
+</form>
+|;

mozilla/webtools/tinderbox/clean.pl

@@ -0,0 +1,42 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+# Figure out which directory tinderbox is in by looking at argv[0]
+
+$tinderboxdir = $0;
+$tinderboxdir =~ s:/[^/]*$::;      # Remove last word, and slash before it.
+if ($tinderboxdir eq "") {
+    $tinderboxdir = ".";
+}
+
+#print "tinderbox = $tinderboxdir\n"; 
+
+chdir $tinderboxdir || die "Couldn't chdir to $tinderboxdir"; 
+
+#print "cd ok\n";
+
+open FL, "find . -name \"*.gz\" -mtime +7 -print |";
+
+#print "find ok\n";
+
+while( <FL> ){
+    chop();
+    #print "unlink $_\n";
+    unlink $_;
+}

mozilla/webtools/tinderbox/copydata.pl

@@ -0,0 +1,91 @@
+#!/tools/ns/bin/perl5
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+#
+# to run this script execute 'nohup copydata.pl &' from the tinderbox directory
+#
+
+$start_dir = `pwd`;
+chop($start_dir);
+$scp_cmd = "scp  -o 'User snapshot' -o'Port 22' -o 'UserKnownHostsFile /u/shaver/snapshot/known_hosts' -o 'IdentityFile /u/shaver/snapshot/identity'";
+
+
+$last_time = 0;
+
+$min_cycle_time = 3 * 60;  # 3 minutes
+
+print "starting dir is :$start_dir\n";
+
+while( 1 ){
+    chdir("$start_dir");
+    if( time - $last_time < $min_cycle_time ){
+        $sleep_time = $min_cycle_time - (time - $last_time);
+        print "\n\nSleeping $sleep_time seconds ...\n";
+        sleep( $sleep_time );
+    }
+
+    &copy_data("Mozilla");
+    &copy_data("raptor");
+
+    chdir( "$start_dir");
+    print  "$scp_cmd * cvs1.mozilla.org:/e/webtools/tinderbox\n";
+    system "$scp_cmd * cvs1.mozilla.org:/e/webtools/tinderbox";
+
+    chdir( "$start_dir/../bonsai");
+    print  "$scp_cmd * cvs1.mozilla.org:/e/webtools/bonsai\n";
+    system "$scp_cmd * cvs1.mozilla.org:/e/webtools/bonsai";
+
+
+    $last_time = time;
+}
+
+1;
+
+
+sub copy_data {
+    local($data_dir) = @_;
+    local($zips,$qry);
+
+chdir $data_dir || die "couldn't chdir to $data_dir";
+
+system "echo hello >lastup.new";
+
+if( -r 'lastup' ) {
+    $qry = '-newer lastup.old';
+    rename 'lastup', 'lastup.old'
+}
+rename 'lastup.new', 'lastup';
+
+
+open( FINDER, "find . $qry -name \"*.gz\" -print|" );
+while(<FINDER>){
+    print;
+    chop;
+    $zips .= "$_ ";
+}
+close( FINDER );
+
+unlink 'lastup.old';
+
+print "$scp_cmd *.txt $zips *.dat cvs1.mozilla.org:/e/webtools/tinderbox/$data_dir\n";
+system "$scp_cmd *.txt $zips *.dat cvs1.mozilla.org:/e/webtools/tinderbox/$data_dir";
+
+
+chdir $start_dir || die "couldn't chdir to $start_dir";
+}

mozilla/webtools/tinderbox/doadmin.cgi

@@ -0,0 +1,217 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+
+use lib "../bonsai";
+require 'lloydcgi.pl';
+require 'globals.pl';
+
+umask O666;
+
+
+$|=1;
+
+check_password();
+
+print "Content-type: text/html\n\n<HTML>\n";
+
+$command = $form{'command'};
+$tree= $form{'tree'};
+
+if( $command eq 'create_tree' ){
+    &create_tree;
+}
+elsif( $command eq 'remove_build' ){
+    &remove_build;
+}
+elsif( $command eq 'trim_logs' ){
+    &trim_logs;
+}
+elsif( $command eq 'set_message' ){
+    &set_message;
+}
+elsif( $command eq 'disable_builds' ){
+    &disable_builds;
+} else {
+    print "Unknown command: \"$command\".";
+}
+
+sub trim_logs {
+    $days = $form{'days'};
+    $tree = $form{'tree'};
+
+    print "<h2>Trimming Log files for $tree...</h2>\n<p>";
+    
+    $min_date = time - (60*60*24 * $days);
+
+    #
+    # Nuke the old log files
+    #
+    $i = 0;
+    opendir( D, 'DogbertTip' );
+    while( $fn = readdir( D ) ){
+        if( $fn =~ /\.gz$/ ){
+            ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,
+                $ctime,$blksize,$blocks) = stat("$tree/$fn");
+            if( $mtime && ($mtime < $min_date) ){
+                print "$fn\n";
+                $tblocks += $blocks;
+                unlink( "$tree/$fn" );
+                $i++;
+            }
+        }
+    }
+    closedir( D );
+    $k = $tblocks*512/1024;
+    print "<br><b>$i Logfiles ( $k K bytes ) removed</b><br>\n";
+
+    #
+    # Trim build.dat
+    #
+    $builds_removed = 0;
+    open(BD, "<$tree/build.dat");
+    open(NBD, ">$tree/build.dat.new");
+    while( <BD> ){
+        ($mailtime,$buildtime,$buildname) = split( /\|/ );
+        if( $buildtime >= $min_date ){
+            print NBD $_;
+        }
+        else {
+            $builds_removed++;
+        }
+    }
+    close( BD );
+    close( NBD );
+
+    rename( "$tree/build.dat", "$tree/build.dat.old" );
+    rename( "$tree/build.dat.new", "$tree/build.dat" );
+
+    print "<h2>$builds_removed Builds removed from build.dat</h2>\n";
+}
+
+sub create_tree {
+    $treename = $form{'treename'};
+    my $repository = $form{'repository'};
+    $modulename = $form{'modulename'};
+    $branchname = $form{'branchname'};
+
+    if( -r $treename ){
+        chmod 0777, $treename;
+    }
+    else {
+        mkdir( $treename, 0777 ) || die "<h1> Cannot mkdir $treename</h1>";
+    }
+    open( F, ">$treename/treedata.pl" );
+    print F "\$cvs_module='$modulename';\n";
+    print F "\$cvs_branch='$branchname';\n";
+    if ($repository ne "") {
+        print F "\$cvs_root='$repository';\n";
+    }
+    close( F );
+
+    open( F, ">$treename/build.dat" );
+    close( F );
+    
+    open( F, ">$treename/who.dat" );
+    close( F );
+
+    open( F, ">$treename/notes.txt" );
+    close( F );
+
+    chmod 0777, "$treename/build.dat", "$treename/who.dat", "$treename/notes.txt",
+                "$treename/treedata.pl";
+
+    print "<h2><a href=showbuilds.cgi?tree=$treename>Tree created or modified</a></h2>\n";
+}
+
+sub remove_build {
+    $build_name = $form{'build'};
+
+    #
+    # Trim build.dat
+    #
+    $builds_removed = 0;
+    open(BD, "<$tree/build.dat");
+    open(NBD, ">$tree/build.dat.new");
+    while( <BD> ){
+        ($mailtime,$buildtime,$bname) = split( /\|/ );
+        if( $bname ne $build_name ){
+            print NBD $_;
+        }
+        else {
+            $builds_removed++;
+        }
+    }
+    close( BD );
+    close( NBD );
+    chmod( 0777, "$tree/build.dat.new");
+
+    rename( "$tree/build.dat", "$tree/build.dat.old" );
+    rename( "$tree/build.dat.new", "$tree/build.dat" );
+
+    print "<h2><a href=showbuilds.cgi?tree=$tree>
+            $builds_removed Builds removed from build.dat</a></h2>\n";
+}
+
+sub disable_builds {
+    my $i,%buildnames;
+    $build_name = $form{'build'};
+
+    #
+    # Trim build.dat
+    #
+    open(BD, "<$tree/build.dat");
+    while( <BD> ){
+        ($mailtime,$buildtime,$bname) = split( /\|/ );
+        $buildnames{$bname} = 0;
+    }
+    close( BD );
+
+    for $i (keys %form) {
+        if ($i =~ /^build_/ ){
+            $i =~ s/^build_//;
+            $buildnames{$i} = 1;
+        }
+    }
+
+    open(IGNORE, ">$tree/ignorebuilds.pl");
+    print IGNORE '$ignore_builds = {' . "\n";
+    for $i ( sort keys %buildnames ){
+        if( $buildnames{$i} == 0 ){
+            print IGNORE "\t\t'$i' => 1,\n";
+        }
+    }
+    print IGNORE "\t};\n";
+
+    chmod( 0777, "$tree/ignorebuilds.pl");
+    print "<h2><a href=showbuilds.cgi?tree=$treename>Build state Changed</a></h2>\n";
+}
+
+
+sub set_message {
+    $m = $form{'message'};
+    $m =~ s/\'/\\'/g;
+    open(MOD, ">$tree/mod.pl");
+    print MOD "\$message_of_day = \'$m\'\;\n1;";
+    close(MOD);
+    chmod( 0777, "$tree/mod.pl");
+    print "<h2><a href=showbuilds.cgi?tree=$tree>
+            Message Changed</a></h2>\n";
+}
+

mozilla/webtools/tinderbox/ep_mac.pl

@@ -0,0 +1,45 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ /Error  /   # C error
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /Couldn\'t find project file / # CW project error
+;
+}
+
+sub has_warning {                                    
+    $line =~ /^[A-Za-z0-9_]+\.[A-Za-z0-9]+\ line [0-9]+/ ;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    if( $line =~ /^(([A-Za-z0-9_]+\.[A-Za-z0-9]+) line ([0-9]+))/ ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    return 0;
+}

mozilla/webtools/tinderbox/ep_unix.pl

@@ -0,0 +1,59 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ /^C /   # cvs merge conflict
+    || $line =~ / Error: /   # C error
+    || $line =~ / error\([0-9]*\)\:/   # C error
+    || ($line =~ /gmake/ && $line =~ / Error /)
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /\: cannot find module/ #cvs error
+
+    ;
+}
+
+
+sub has_warning {                                    
+    $line =~ /^[A-Za-z0-9_]+\.[A-Za-z0-9]+\:[0-9]+\:/ 
+    || $line =~ /^\"[A-Za-z0-9_]+\.[A-Za-z0-9]+\"\, line [0-9]+\:/ 
+;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    if( $line =~ /^(([A-Za-z0-9_]+\.[A-Za-z0-9]+)\:([0-9]+)\:)/ ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    if ( $line =~ /^(\"([A-Za-z0-9_]+\.[A-Za-z0-9]+)\"\, line ([0-9]+)\:)/  ){
+        $error_file = $1;
+        $error_file_ref = $2;
+        $error_line = $3;
+        $error_guess = 1;
+        return 1;
+    }
+    return 0;
+}

mozilla/webtools/tinderbox/ep_windows.pl

@@ -0,0 +1,73 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+# 
+# Scan a line and see if it has an error
+#
+sub has_error {
+    $line =~ /fatal error/  # link error
+    || $line =~ / error /   # C error
+    || $line =~ /^C /   # cvs merge conflict
+    || $line =~ /error C/   # C error
+    || $line =~ /Creating new precompiled header/   # Wastes time.
+    || $line =~ /error:/    # java error
+    || $line =~ /jmake.MakerFailedException:/    # java error
+    || $line =~ /Unknown host /    # cvs error
+    || $line =~ /: build failed\;/    # nmake error
+    || ($line =~ /gmake/ && $line =~ / Error /)
+    || $line =~ /\[checkout aborted\]/ #cvs error
+    || $line =~ /\: cannot find module/ #cvs error
+;
+}
+
+
+sub has_warning {
+    $line =~ /: warning/  # link error
+    || $line =~ / error /   # C error
+;
+}
+
+sub has_errorline {
+    local( $line ) = @_;
+    $error_file = ''; #'NS\CMD\WINFE\CXICON.cpp';
+    $error_line = 0;
+
+    if( $line =~ m@(ns([\\/][a-z0-9\._]+)*)@i ){
+        $error_file = $1;
+        $error_file_ref = lc $error_file;
+        $error_file_ref =~ s@\\@/@g;
+
+        $line =~ m/\(([0-9]+)\)/;
+        $error_line = $1;
+        return 1;
+    }
+
+    if( $line =~ m@(^([A-Za-z0-9_]+\.[A-Za-z])+\(([0-9]+)\))@ ){
+        $error_file = $1;
+        $error_file_ref = lc $2;
+        $error_line = $3;
+        $error_guess=1;
+        $error_file_ref =~ s@\\@/@g;
+
+        return 1;
+    }
+
+    return 0;
+}
+

mozilla/webtools/tinderbox/examples/README

@@ -0,0 +1,44 @@
+This directory contains example Tinderbox client scripts. These scripts are
+for illustration/documentation purposes only and are not maintained
+regularly. Current scripts to build mozilla will live in an another spot
+in the mozilla tree.
+
+Three examples have been provided:
+
+mozilla-windows.pl: perl script that drives mozilla tinderbox builds for Win32
+mozilla-unix.pl   : perl script that drives mozilla tinderbox builds for UNIX
+build-moz-smoke.pl: perl script that drives mozilla tinderbox builds for UNIX,
+	and subsequently runs the executable returning a green tree only if
+	it does not crash.
+
+These scripts show the basic elements of a Tinderbox client script. These
+elements are:
+
+1) Sending a start e-mail to the Tinderbox server, in the form of a formatted
+mail message. Example:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: building
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+tinderbox: buildfamily: unix
+
+2) Obtain a source tree by performing a cvs checkout.
+
+3) Perform the build, saving the output to a log file.
+
+4) Determine if the build was successful or failed. This could be done either
+by checking for the presence of a binary, or being using error codes returned
+from the compile command.
+
+5) Send a completion message to Tinderbox, identifying build success or
+failure.  Example:
+
+tinderbox: tree: Mozilla
+tinderbox: builddate: 900002087
+tinderbox: status: success
+tinderbox: build: IRIX 6.3 Depend
+tinderbox: errorparser: unix
+tinderbox: buildfamily: unix
+

mozilla/webtools/tinderbox/examples/build-moz-smoke.pl

@@ -0,0 +1,594 @@
+#!/usr/bin/perl
+
+require 5.000;
+
+use Sys::Hostname;
+use POSIX "sys_wait_h";
+use Cwd;
+
+$Version = "1.000";
+
+sub InitVars {
+
+    # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+    $BuildAdministrator = "$ENV{'USER'}\@$ENV{'HOST'}";
+
+    #Default values of cmdline opts
+    $BuildDepend = 1;	#depend or clobber
+    $ReportStatus = 1;  # Send results to server or not
+    $BuildOnce = 0;     # Build once, don't send results to server
+    $BuildClassic = 0;  # Build classic source
+
+    #relative path to binary
+    $BinaryName{'x'} = 'mozilla-export';
+    $BinaryName{'qt'} = 'qtmozilla-export';
+    $BinaryName{'gnome'} = 'gnuzilla-export';
+    $BinaryName{'webshell'} = '/webshell/tests/viewer/viewer';
+
+    # Set these to what makes sense for your system
+    $cpus = 1;
+    $Make = 'gmake'; # Must be gnu make
+    $mail = '/bin/mail';
+    $Autoconf = 'autoconf -l build/autoconf';
+    $CVS = 'cvs -z3';
+    $CVSCO = 'co -P';
+
+    # Set these proper values for your tinderbox server
+    $Tinderbox_server = 'tinderbox-daemon\@cvs-mirror.mozilla.org';
+    #$Tinderbox_server = 'external-tinderbox-incoming\@tinderbox.seawood.org';
+
+    # These shouldn't really need to be changed
+    $BuildSleep = 10; # Minimum wait period from start of build to start
+                      # of next build in minutes
+    $BuildTree = 'SeaMonkey';
+    $BuildTag = '';
+    $BuildName = '';
+    $TopLevel = '.';
+    $Topsrcdir = 'mozilla';
+    $BuildObjName = '';
+    $BuildConfigDir = 'mozilla/config';
+    $ClobberStr = 'realclean';
+    $ConfigureEnvArgs = 'CFLAGS=-pipe CXXFLAGS=-pipe';
+    #$ConfigureEnvArgs = '';
+    $ConfigureArgs = "--with-nspr=/usr/local/nspr --cache-file=/dev/null --with-static-gtk --enable-editor";
+    $ConfigGuess = './build/autoconf/config.guess';
+    $Logfile = '${BuildDir}.log';
+} #EndSub-InitVars
+
+sub ConditionalArgs {
+    if ( $BuildClassic ) {
+	$FE = 'x';
+	$ConfigureArgs .= " --enable-fe=$FE";
+#	$BuildTree = 'raptor';
+	$BuildModule = 'Raptor';
+	$BuildTag = ''
+	    if ($BuildTag eq '');
+	$TopLevel = "mozilla-classic";
+    } else {
+#	$BuildTree = 'raptor';
+#	$Toolkit = 'gtk';
+	$FE = 'webshell'; 
+#	$BuildModule = 'Raptor';
+	$BuildModule = 'SeaMonkeyAll';
+#	$ConfigureArgs .= " --enable-toolkit=$Toolkit";
+    }
+    $CVSCO .= " -r $BuildTag" if ( $BuildTag ne '');
+}
+sub SetupEnv {
+    umask(0);
+    $ENV{"CVSROOT"} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+    $ENV{"LD_LIBRARY_PATH"} = '/usr/local/nspr:/builds/tinderbox/SeaMonkey/Linux_2.0.34_clobber/mozilla/obj-i586-pc-linux-gnu/dist/bin:/usr/lib/png:/usr/local/lib';
+    $ENV{"DISPLAY"} = 'crucible.mcom.com:0.0';
+} #EndSub-SetupEnv
+
+sub SetupPath {
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+} #EndSub-SetupPath
+
+##########################################################################
+# NO USER CONFIGURABLE PIECES BEYOND THIS POINT                          #
+##########################################################################
+
+sub GetSystemInfo {
+
+    $OS = `uname -s`;
+    $OSVer = `uname -r`;
+    
+    chop($OS, $OSVer);
+    
+    if ( $OS eq 'AIX' ) {
+	$OSVer = `uname -v`;
+	chop($OSVer);
+	$OSVer = $OSVer . "." . `uname -r`;
+	chop($OSVer);
+    }
+        
+    if ( $OS eq 'IRIX64' ) {
+	$OS = 'IRIX';
+    }
+    
+    if ( $OS eq 'SCO_SV' ) {
+	$OS = 'SCOOS';
+	$OSVer = '5.0';
+    }
+    
+    my $host, $myhost = hostname;
+    chomp($myhost);
+    ($host, $junk) = split(/\./, $myhost);
+	
+    $BuildName = ""; 
+	
+    if ( "$host" ne "" ) {
+	$BuildName = $host . ' ';
+    }
+    $BuildName .= $OS . ' ' . $OSVer . ' ' . ($BuildDepend?'Depend':'Clobber');
+    $DirName = $OS . '_' . $OSVer . '_' . ($BuildDepend?'depend':'clobber');
+    
+    $RealOS = $OS;
+    $RealOSVer = $OSVer;
+    
+    if ( $OS eq 'HP-UX' ) {
+	$RealOSVer = substr($OSVer,0,4);
+    }
+    
+    if ( $OS eq 'Linux' ) {
+	$RealOSVer = substr($OSVer,0,3);
+    }
+
+    if ($BuildClassic) {
+        $logfile = "${DirName}-classic.log";
+    } else {
+	$logfile = "${DirName}.log";
+    }
+} #EndSub-GetSystemInfo
+
+sub BuildIt {
+    my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
+
+    mkdir("$DirName", 0777);
+    chdir("$DirName") || die "Couldn't enter $DirName";
+    
+    $StartDir = getcwd();
+    $LastTime = 0;
+    
+    print "Starting dir is : $StartDir\n";
+    
+    $EarlyExit = 0;
+    
+    while ( ! $EarlyExit ) {
+	chdir("$StartDir");
+	if ( time - $LastTime < (60 * $BuildSleep) ) {
+	    $SleepTime = (60 * $BuildSleep) - (time - $LastTime);
+	    print "\n\nSleeping $SleepTime seconds ...\n";
+	    sleep($SleepTime);
+	}
+	
+	$LastTime = time;
+	
+	$StartTime = time - 60 * 10;
+	$StartTimeStr = &CVSTime($StartTime);
+	
+	&StartBuild if ($ReportStatus);
+ 	$CurrentDir = getcwd();
+	if ( $CurrentDir ne $StartDir ) {
+	    print "startdir: $StartDir, curdir $CurrentDir\n";
+	    die "curdir != startdir";
+	}
+
+	$BuildDir = $CurrentDir;
+	
+	unlink( "$logfile" );
+	
+	print "opening $logfile\n";
+	open( LOG, ">$logfile" ) || print "can't open $?\n";
+	print LOG "current dir is -- $hostname:$CurrentDir\n";
+	print LOG "Build Administrator is $BuildAdministrator\n";
+	&PrintEnv;
+	
+	$BuildStatus = 0;
+
+	mkdir($TopLevel, 0777);
+	chdir($TopLevel) || die "chdir($TopLevel): $!\n";
+	
+	if ( $BuildClassic ) {
+	    print"$CVS $CVSCO $BuildModule\n";
+	    print LOG "$CVS $CVSCO $BuildModule\n";
+	    open (PULL, "$CVS $CVSCO $BuildModule 2>&1 |") || die "open: $!\n";
+	} else {
+#	    print "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    print LOG "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    open (PULL, "$CVS $CVSCO mozilla/nglayout.mk 2>&1 |") || die "open: $!\n";
+	    print "$CVS $CVSCO mozilla/client.mk\n";
+	    print LOG "$CVS $CVSCO mozilla/client.mk\n";
+	    open (PULL, "$CVS $CVSCO mozilla/client.mk 2>&1 |") || die "open: $!\n";
+	}
+	while (<PULL>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(PULL);
+	
+	# Move to topsrcdir
+	#chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+         
+
+	# Do a separate checkout with toplevel makefile
+	if (! $BuildClassic) {
+	 #  print LOG "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO'|\n";
+	 #  open (PULLALL, "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO' |\n");
+	    print LOG "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO'|\n";
+	    open (PULLALL, "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO' |\n");
+	    while (<PULLALL>) {
+		print LOG $_;
+		print $_;
+	    }
+	    close(PULLALL);
+	}
+
+	chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+
+	print LOG "$Autoconf\n";
+	open (AUTOCONF, "$Autoconf 2>&1 | ") || die "$Autoconf: $!\n";
+	while (<AUTOCONF>) {
+	    print LOG $_;
+	    print $_;
+	}
+	close(AUTOCONF);
+
+	print LOG "$ConfigGuess\n";
+	$BuildObjName = "obj-";
+	open (GETOBJ, "$ConfigGuess 2>&1 |") || die "$ConfigGuess: $!\n";
+	while (<GETOBJ>) {
+	    print $_;
+	    print LOG $_;
+	    chomp($BuildObjName .= $_); 
+	}
+	close (GETOBJ); 
+	
+	mkdir($BuildObjName, 0777);
+	chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
+	
+	print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
+	open (CONFIGURE, "$ConfigureEnvArgs ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+	while (<CONFIGURE>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(CONFIGURE);
+	    
+	# if we are building depend, rebuild dependencies
+	
+	if ($BuildDepend) {
+	    print LOG "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n";
+	    open ( MAKEDEPEND, "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n");
+	    while ( <MAKEDEPEND> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close (MAKEDEPEND);
+	    system("rm -rf dist");
+
+	} else {
+	    # Building clobber
+	    print LOG "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |\n";
+	    open( MAKECLOBBER, "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |");	    
+	    while ( <MAKECLOBBER> ) {
+	    	print $_;
+	    	print LOG $_;
+	    }
+	    close( MAKECLOBBER );
+	}
+
+	@felist = split(/,/, $FE);
+	    
+	foreach $fe ( @felist ) {	    
+	    if (&BinaryExists($fe)) {
+		print LOG "deleting existing binary\n";
+		&DeleteBinary($fe);
+	    }
+	}
+
+	if ($BuildClassic) {
+	    # Build the BE only	    
+	    print LOG "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |\n";
+	    open( BEBUILD, "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |");
+	    
+	    while ( <BEBUILD> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close( BEBUILD );
+
+	    foreach $fe ( @felist ) {		   
+		# Now build each front end
+		print LOG "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n";
+		open(FEBUILD, "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n");
+		while (<FEBUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(FEBUILD);
+	    }
+	} else {
+		print LOG "$Make MAKE='$Make -j $cpus' 2>&1 |\n";
+		open(BUILD, "$Make MAKE='$Make -j $cpus' 2>&1 |\n");
+		while (<BUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(BUILD);
+	}
+
+	foreach $fe (@felist) {
+	    if (&BinaryExists($fe)) {
+		   print LOG "export binary exists, build successful. Testing...\n";
+#return 0 if no problem, else 333 for a runtime error
+           $BuildStatus = &RunSmokeTest($fe);
+	    }
+	    else {
+		   print LOG "export binary missing, build FAILED\n";
+		   $BuildStatus = 666;
+	    }
+	   
+	    if ( $BuildStatus == 0 ) {
+ 	       $BuildStatusStr = 'success';
+	    }
+	    elsif ( $BuildStatus == 333 ) {
+           $BuildStatusStr = 'testfailed';
+        }
+		else {
+           $BuildStatusStr = 'busted';
+        }
+# replaced by above lines
+#	    $BuildStatusStr = ( $BuildStatus ? 'busted' : 'success' );
+
+	    print LOG "tinderbox: tree: $BuildTree\n";
+	    print LOG "tinderbox: builddate: $StartTime\n";
+	    print LOG "tinderbox: status: $BuildStatusStr\n";
+	    print LOG "tinderbox: build: $BuildName $fe\n";
+	    print LOG "tinderbox: errorparser: unix\n";
+	    print LOG "tinderbox: buildfamily: unix\n";
+	    print LOG "tinderbox: END\n";	    
+	}
+	close(LOG);
+	chdir("$StartDir");
+	
+# this fun line added on 2/5/98. do not remove. Translated to english,
+# that's "take any line longer than 1000 characters, and split it into less
+# than 1000 char lines.  If any of the resulting lines is
+# a dot on a line by itself, replace that with a blank line."  
+# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
+# interprets that as the end of the mail, and truncates the log before
+# it gets to Tinderbox.  (terry weismann, chris yeh)
+#
+# This was replaced by a perl 'port' of the above, writen by 
+# preed@netscape.com; good things: no need for system() call, and now it's
+# all in perl, so we don't have to do OS checking like before.
+
+	open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
+	open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
+	    
+	while (<LOG>) {
+	    $q = 0;
+	    
+	    for (;;) {
+		$val = $q * 1000;
+		$Output = substr($_, $val, 1000);
+		
+		last if $Output eq undef;
+		
+		$Output =~ s/^\.$//g;
+		$Output =~ s/\n//g;
+		print OUTLOG "$Output\n";
+		$q++;
+	    } #EndFor
+		
+	} #EndWhile
+	    
+	close(LOG);
+	close(OUTLOG);
+
+	system( "$mail $Tinderbox_server < ${logfile}.last" )
+	    if ($ReportStatus );
+	unlink("$logfile");
+	
+	# if this is a test run, set early_exit to 0. 
+	#This mean one loop of execution
+	$EarlyExit++ if ($BuildOnce);
+    }
+    
+} #EndSub-BuildIt
+
+sub CVSTime {
+    my($StartTimeArg) = @_;
+    my($RetTime, $StartTimeArg, $sec, $minute, $hour, $mday, $mon, $year);
+    
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
+    $mon++; # month is 0 based.
+    
+    sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
+}
+
+sub StartBuild {
+    
+    my($fe, @felist);
+
+    @felist = split(/,/, $FE);
+
+#    die "SERVER: " . $Tinderbox_server . "\n";
+    open( LOG, "|$mail $Tinderbox_server" );
+    foreach $fe ( @felist ) {
+	print LOG "\n";
+	print LOG "tinderbox: tree: $BuildTree\n";
+	print LOG "tinderbox: builddate: $StartTime\n";
+	print LOG "tinderbox: status: building\n";
+	print LOG "tinderbox: build: $BuildName $fe\n";
+	print LOG "tinderbox: errorparser: unix\n";
+	print LOG "tinderbox: buildfamily: unix\n";
+	print LOG "tinderbox: END\n";
+	print LOG "\n";
+    }
+    close( LOG );
+}
+
+# check for the existence of the binary
+sub BinaryExists {
+    my($fe) = @_;
+    my($Binname);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/'. $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG $BinName . "\n"; 
+    if ((-e $BinName) && (-x $BinName) && (-s $BinName)) {
+	1;
+    }
+    else {
+	0;
+    }
+}
+
+sub DeleteBinary {
+    my($fe) = @_;
+    my($BinName);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG "unlinking $BinName\n";
+    unlink ($BinName) || print LOG "unlinking $BinName failed\n";
+}
+
+sub ParseArgs {
+    my($i, $manArg);
+
+    if( @ARGV == 0 ) {
+	&PrintUsage;
+    }
+    $i = 0;
+    $manArg = 0;
+    while( $i < @ARGV ) {
+	if ($ARGV[$i] eq '--depend') {
+	    $BuildDepend = 1;
+ 	    $manArg++;
+	}
+	elsif ($ARGV[$i] eq '--clobber') {
+	    $BuildDepend = 0;
+	    $manArg++;
+	}
+	elsif ( $ARGV[$i] eq '--once' ) {
+	    $BuildOnce = 1;
+	    #$ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--classic') {
+	    $BuildClassic = 1;
+	}
+	elsif ($ARGV[$i] eq '--noreport') {
+	    $ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
+	    die "$0: version $Version\n";
+	}
+	elsif ( $ARGV[$i] eq '-tag' ) {
+	    $i++;
+	    $BuildTag = $ARGV[$i];
+	    if ( $BuildTag eq '' || $BuildTag eq '-t') {
+		&PrintUsage;
+	    }
+	}
+	elsif ( $ARGV[$i] eq '-t' ) {
+	    $i++;
+	    $BuildTree = $ARGV[$i];
+	    if ( $BuildTree eq '' ) {
+		&PrintUsage;
+	    }
+	} else {
+	    &PrintUsage;
+	}
+
+	$i++;
+    } #EndWhile
+
+    if ( $BuildTree =~ /^\s+$/i ) {
+	&PrintUsage;
+    }
+
+    if ($BuildDepend eq undef) {
+	&PrintUsage;
+    }
+
+    &PrintUsage if (! $manArg );
+
+} #EndSub-ParseArgs
+
+sub PrintUsage {
+    die "usage: $0 [--depend | --clobber] [-v | --version ] [--once --classic --noreport -tag TREETAG -t TREENAME ]\n";
+}
+
+sub PrintEnv {
+    my ($key);
+    foreach $key (keys %ENV) {
+	print LOG "$key = $ENV{$key}\n";
+	print "$key = $ENV{$key}\n";
+    }
+} #EndSub-PrintEnv
+
+sub RunSmokeTest {
+    my($fe) = @_;
+    my($Binary);
+    $fe = 'x' if (!defined($fe));
+
+    $Binary = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    print LOG $BinName . "\n";
+
+   $waittime = 30;
+
+   $pid = fork;
+
+   exec $Binary if !$pid;
+
+   # parent - wait $waittime seconds then check on child
+   sleep $waittime;
+   $status = waitpid $pid, WNOHANG();
+   if ($status != 0) {
+     print LOG "$BinName has crashed or quit. Turn the tree orange now.\n";
+     return 333;
+   }
+
+   print LOG "Success! $BinName is still running. Killing..\n";
+   # try to kill 3 times, then try a kill -9
+   for ($i=0 ; $i<3 ; $i++) {
+     kill 'TERM',$pid,;
+     # give it 3 seconds to actually die
+     sleep 3;
+     $status = waitpid $pid, WNOHANG();
+    last if ($status != 0);
+   }
+   return 0;
+} #EndSub-RunSmokeTest
+ 
+# Main function
+&InitVars;
+&ParseArgs;
+&ConditionalArgs;
+&GetSystemInfo;
+&SetupEnv;
+&SetupPath;
+&BuildIt;
+
+1;

mozilla/webtools/tinderbox/examples/buildit.config

@@ -0,0 +1,63 @@
+#!/usr/bin/perl
+
+sub InitVars {
+
+#initialize variables
+#$binary_name = '/netscape-export';
+$BinaryName = '/mozilla-export';
+$BuildDepend = 1;	#depend or clobber
+$BuildTree = '';
+$BuildTag = '';
+$BuildName = '';
+#$BuildContinue = 0;
+$TopLevel = 'mozilla/';
+$BuildObjName = '';
+$BuildSleep = 10;
+$BuildUnixclasses = 0;
+$EarlyExit = 1;
+$BuildStartDir = 'ns/';
+$BuildConfigDir = 'mozilla/config';
+
+} #EndSub-InitVars
+
+sub SetupEnv {
+
+	umask(0);
+	$ENV{'MOZILLA_CLIENT'} = 1;
+	$ENV{'NETSCAPE_HIERARCHY'} = 1;
+	$ENV{'BUILD_OFFICIAL'} = 1;
+	$ENV{'NSPR20'} = 1;
+	$ENV{'AWT_11'} = 1;
+	$ENV{'MOZ_SECURITY'} = 1;
+	$ENV{"CVSROOT"} = '/m/src';
+	$ENV{"MAKE"} = 'gmake -e';
+	$ENV{'MOZ_MEDIUM'} = 1;
+	$ENV{'NO_MDUPDATE'} = 1;
+	$ENV{'EDITOR'} = 1;
+
+} #EndSub-SetupEnv
+
+sub SetupPath {
+
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+    $ENV{'PATH'} = '/tools/ns/bin:/tools/contrib/bin:/usr/local/bin:/usr/sbin:/usr/bsd:/sbin:/usr/bin:/bin:/usr/bin/X11:/usr/etc:/usr/hosts:/usr/ucb:';
+
+    # This won't work on x86 or sunos4 systems....
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:/tools/ns/soft/gcc-2.6.3/run/default/sparc_sun_solaris2.4/bin:' . $ENV{'PATH'};
+	$ENV{'NO_MDUPDATE'} = 1;
+    }
+
+    if ( $OS eq 'AIX' ) {
+	$ENV{'PATH'} = $ENV{'PATH'} . '/usr/lpp/xlC/bin:/usr/local-aix/bin:';
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+
+} #EndSub-SetupPath
+
+
+1;

mozilla/webtools/tinderbox/examples/mozilla-unix.pl

@@ -0,0 +1,548 @@
+#!/usr/bin/perl
+
+require 5.000;
+
+use Sys::Hostname;
+use Cwd;
+
+$Version = "1.000";
+
+sub InitVars {
+
+    # PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
+    $BuildAdministrator = "$ENV{'USER'}\@$ENV{'HOST'}";
+
+    #Default values of cmdline opts
+    $BuildDepend = 1;	#depend or clobber
+    $ReportStatus = 1;  # Send results to server or not
+    $BuildOnce = 0;     # Build once, don't send results to server
+    $BuildClassic = 0;  # Build classic source
+
+    #relative path to binary
+    $BinaryName{'x'} = 'mozilla-export';
+    $BinaryName{'qt'} = 'qtmozilla-export';
+    $BinaryName{'gnome'} = 'gnuzilla-export';
+    $BinaryName{'webshell'} = '/webshell/tests/viewer/viewer';
+    $BinaryName{'xpfe'} = '/xpfe/xpviewer/src/xpviewer';
+
+    # Set these to what makes sense for your system
+    $cpus = 1;
+    $Make = 'gmake'; # Must be gnu make
+    $mail = '/bin/mail';
+    $Autoconf = 'autoconf -l build/autoconf';
+    $CVS = 'cvs -z3';
+    $CVSCO = 'co -P';
+
+    # Set these proper values for your tinderbox server
+    $Tinderbox_server = 'tinderbox-daemon\@warp.mcom.com';
+    #$Tinderbox_server = 'external-tinderbox-incoming\@tinderbox.seawood.org';
+
+    # These shouldn't really need to be changed
+    $BuildSleep = 10; # Minimum wait period from start of build to start
+                      # of next build in minutes
+    $BuildTree = 'raptor';
+    $BuildTag = '';
+    $BuildName = '';
+    $TopLevel = '.';
+    $Topsrcdir = 'mozilla';
+    $BuildObjName = '';
+    $BuildConfigDir = 'mozilla/config';
+    $ClobberStr = 'realclean';
+    $ConfigureEnvArgs = 'CFLAGS=-pipe CXXFLAGS=-pipe';
+    #$ConfigureEnvArgs = '';
+    $ConfigureArgs = "--cache-file=/dev/null";
+    $ConfigGuess = './build/autoconf/config.guess';
+    $Logfile = '${BuildDir}.log';
+} #EndSub-InitVars
+
+sub ConditionalArgs {
+    if ( $BuildClassic ) {
+	$FE = 'x';
+	$ConfigureArgs .= " --enable-fe=$FE";
+	$BuildTree = 'raptor';
+	$BuildModule = 'Raptor';
+	$BuildTag = ''
+	    if ($BuildTag eq '');
+	$TopLevel = "mozilla-classic";
+    } else {
+	$BuildTree = 'raptor';
+#	$Toolkit = 'gtk';
+	$FE = 'webshell,xpfe'; 
+	$BuildModule = 'Raptor';
+#	$ConfigureArgs .= " --enable-toolkit=$Toolkit";
+    }
+    $CVSCO .= " -r $BuildTag" if ( $BuildTag ne '');
+}
+sub SetupEnv {
+    umask(0);
+    $ENV{"CVSROOT"} = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot';
+} #EndSub-SetupEnv
+
+sub SetupPath {
+    my($Path);
+    $Path = $ENV{PATH};
+    print "Path before: $Path\n";
+
+    if ( $OS eq 'SunOS' ) {
+	$ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
+    }
+
+    $Path = $ENV{PATH};
+    print "Path After: $Path\n";
+} #EndSub-SetupPath
+
+##########################################################################
+# NO USER CONFIGURABLE PIECES BEYOND THIS POINT                          #
+##########################################################################
+
+sub GetSystemInfo {
+
+    $OS = `uname -s`;
+    $OSVer = `uname -r`;
+    
+    chop($OS, $OSVer);
+    
+    if ( $OS eq 'AIX' ) {
+	$OSVer = `uname -v`;
+	chop($OSVer);
+	$OSVer = $OSVer . "." . `uname -r`;
+	chop($OSVer);
+    }
+        
+    if ( $OS eq 'IRIX64' ) {
+	$OS = 'IRIX';
+    }
+    
+    if ( $OS eq 'SCO_SV' ) {
+	$OS = 'SCOOS';
+	$OSVer = '5.0';
+    }
+    
+    my $host, $myhost = hostname;
+    chomp($myhost);
+    ($host, $junk) = split(/\./, $myhost);
+	
+    $BuildName = ""; 
+	
+    if ( "$host" ne "" ) {
+	$BuildName = $host . ' ';
+    }
+    $BuildName .= $OS . ' ' . $OSVer . ' ' . ($BuildDepend?'Depend':'Clobber');
+    $DirName = $OS . '_' . $OSVer . '_' . ($BuildDepend?'depend':'clobber');
+    
+    $RealOS = $OS;
+    $RealOSVer = $OSVer;
+    
+    if ( $OS eq 'HP-UX' ) {
+	$RealOSVer = substr($OSVer,0,4);
+    }
+    
+    if ( $OS eq 'Linux' ) {
+	$RealOSVer = substr($OSVer,0,3);
+    }
+
+    if ($BuildClassic) {
+        $logfile = "${DirName}-classic.log";
+    } else {
+	$logfile = "${DirName}.log";
+    }
+} #EndSub-GetSystemInfo
+
+sub BuildIt {
+    my ($fe, @felist, $EarlyExit, $LastTime, $StartTimeStr);
+
+    mkdir("$DirName", 0777);
+    chdir("$DirName") || die "Couldn't enter $DirName";
+    
+    $StartDir = getcwd();
+    $LastTime = 0;
+    
+    print "Starting dir is : $StartDir\n";
+    
+    $EarlyExit = 0;
+    
+    while ( ! $EarlyExit ) {
+	chdir("$StartDir");
+	if ( time - $LastTime < (60 * $BuildSleep) ) {
+	    $SleepTime = (60 * $BuildSleep) - (time - $LastTime);
+	    print "\n\nSleeping $SleepTime seconds ...\n";
+	    sleep($SleepTime);
+	}
+	
+	$LastTime = time;
+	
+	$StartTime = time - 60 * 10;
+	$StartTimeStr = &CVSTime($StartTime);
+	
+	&StartBuild if ($ReportStatus);
+ 	$CurrentDir = getcwd();
+	if ( $CurrentDir ne $StartDir ) {
+	    print "startdir: $StartDir, curdir $CurrentDir\n";
+	    die "curdir != startdir";
+	}
+
+	$BuildDir = $CurrentDir;
+	
+	unlink( "$logfile" );
+	
+	print "opening $logfile\n";
+	open( LOG, ">$logfile" ) || print "can't open $?\n";
+	print LOG "current dir is -- $hostname:$CurrentDir\n";
+	print LOG "Build Administrator is $BuildAdministrator\n";
+	&PrintEnv;
+	
+	$BuildStatus = 0;
+
+	mkdir($TopLevel, 0777);
+	chdir($TopLevel) || die "chdir($TopLevel): $!\n";
+	
+	if ( $BuildClassic ) {
+	    print"$CVS $CVSCO $BuildModule\n";
+	    print LOG "$CVS $CVSCO $BuildModule\n";
+	    open (PULL, "$CVS $CVSCO $BuildModule 2>&1 |") || die "open: $!\n";
+	} else {
+#	    print "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    print LOG "$CVS $CVSCO mozilla/nglayout.mk\n";
+#	    open (PULL, "$CVS $CVSCO mozilla/nglayout.mk 2>&1 |") || die "open: $!\n";
+	    print "$CVS $CVSCO mozilla/client.mk\n";
+	    print LOG "$CVS $CVSCO mozilla/client.mk\n";
+	    open (PULL, "$CVS $CVSCO mozilla/client.mk 2>&1 |") || die "open: $!\n";
+	}
+	while (<PULL>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(PULL);
+	
+	# Move to topsrcdir
+	#chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+         
+
+	# Do a separate checkout with toplevel makefile
+	if (! $BuildClassic) {
+	 #  print LOG "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO'|\n";
+	 #  open (PULLALL, "$Make -f nglayout.mk pull_all CVSCO='$CVS $CVSCO' |\n");
+	    print LOG "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO'|\n";
+	    open (PULLALL, "$Make -f mozilla/client.mk checkout CVSCO='$CVS $CVSCO' |\n");
+	    while (<PULLALL>) {
+		print LOG $_;
+		print $_;
+	    }
+	    close(PULLALL);
+	}
+
+	chdir($Topsrcdir) || die "chdir($Topsrcdir): $!\n";
+
+	print LOG "$Autoconf\n";
+	open (AUTOCONF, "$Autoconf 2>&1 | ") || die "$Autoconf: $!\n";
+	while (<AUTOCONF>) {
+	    print LOG $_;
+	    print $_;
+	}
+	close(AUTOCONF);
+
+	print LOG "$ConfigGuess\n";
+	$BuildObjName = "obj-";
+	open (GETOBJ, "$ConfigGuess 2>&1 |") || die "$ConfigGuess: $!\n";
+	while (<GETOBJ>) {
+	    print $_;
+	    print LOG $_;
+	    chomp($BuildObjName .= $_); 
+	}
+	close (GETOBJ); 
+	
+	mkdir($BuildObjName, 0777);
+	chdir($BuildObjName) || die "chdir($BuildObjName): $!\n";
+	
+	print LOG "$ConfigureEnvArgs ../configure $ConfigureArgs\n";
+	open (CONFIGURE, "$ConfigureEnvArgs ../configure $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
+	while (<CONFIGURE>) {
+	    print $_;
+	    print LOG $_;
+	}
+	close(CONFIGURE);
+	    
+	# if we are building depend, rebuild dependencies
+	
+	if ($BuildDepend) {
+	    print LOG "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n";
+	    open ( MAKEDEPEND, "$Make MAKE='$Make -j $cpus' depend 2>&1 |\n");
+	    while ( <MAKEDEPEND> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close (MAKEDEPEND);
+	    system("rm -rf dist");
+
+	} else {
+	    # Building clobber
+	    print LOG "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |\n";
+	    open( MAKECLOBBER, "$Make MAKE='$Make -j $cpus' $ClobberStr 2>&1 |");	    
+	    while ( <MAKECLOBBER> ) {
+	    	print $_;
+	    	print LOG $_;
+	    }
+	    close( MAKECLOBBER );
+	}
+
+	@felist = split(/,/, $FE);
+	    
+	foreach $fe ( @felist ) {	    
+	    if (&BinaryExists($fe)) {
+		print LOG "deleting existing binary\n";
+		&DeleteBinary($fe);
+	    }
+	}
+
+	if ($BuildClassic) {
+	    # Build the BE only	    
+	    print LOG "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |\n";
+	    open( BEBUILD, "$Make MAKE='$Make -j $cpus' MOZ_FE= 2>&1 |");
+	    
+	    while ( <BEBUILD> ) {
+		print $_;
+		print LOG $_;
+	    }
+	    close( BEBUILD );
+
+	    foreach $fe ( @felist ) {		   
+		# Now build each front end
+		print LOG "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n";
+		open(FEBUILD, "$Make MAKE='$Make -j $cpus' -C cmd/${fe}fe 2>&1 |\n");
+		while (<FEBUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(FEBUILD);
+	    }
+	} else {
+		print LOG "$Make MAKE='$Make -j $cpus' 2>&1 |\n";
+		open(BUILD, "$Make MAKE='$Make -j $cpus' 2>&1 |\n");
+		while (<BUILD>) {
+		    print $_;
+		    print LOG $_;
+		}
+		close(BUILD);
+	}
+
+	foreach $fe (@felist) {
+	    if (&BinaryExists($fe)) {
+		print LOG "export binary exists, build SUCCESSFUL!\n";
+		$BuildStatus = 0;
+	    }
+	    else {
+		print LOG "export binary missing, build FAILED\n";
+		$BuildStatus = 666;
+	    }
+	    
+	    print LOG "\nBuild Status = $BuildStatus\n";
+	    
+	    $BuildStatusStr = ( $BuildStatus ? 'busted' : 'success' );
+	    
+	    print LOG "tinderbox: tree: $BuildTree\n";
+	    print LOG "tinderbox: builddate: $StartTime\n";
+	    print LOG "tinderbox: status: $BuildStatusStr\n";
+	    print LOG "tinderbox: build: $BuildName $fe\n";
+	    print LOG "tinderbox: errorparser: unix\n";
+	    print LOG "tinderbox: buildfamily: unix\n";
+	    print LOG "tinderbox: END\n";	    
+	}
+	close(LOG);
+	chdir("$StartDir");
+	
+# this fun line added on 2/5/98. do not remove. Translated to english,
+# that's "take any line longer than 1000 characters, and split it into less
+# than 1000 char lines.  If any of the resulting lines is
+# a dot on a line by itself, replace that with a blank line."  
+# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
+# interprets that as the end of the mail, and truncates the log before
+# it gets to Tinderbox.  (terry weismann, chris yeh)
+#
+# This was replaced by a perl 'port' of the above, writen by 
+# preed@netscape.com; good things: no need for system() call, and now it's
+# all in perl, so we don't have to do OS checking like before.
+
+	open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
+	open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
+	    
+	while (<LOG>) {
+	    $q = 0;
+	    
+	    for (;;) {
+		$val = $q * 1000;
+		$Output = substr($_, $val, 1000);
+		
+		last if $Output eq undef;
+		
+		$Output =~ s/^\.$//g;
+		$Output =~ s/\n//g;
+		print OUTLOG "$Output\n";
+		$q++;
+	    } #EndFor
+		
+	} #EndWhile
+	    
+	close(LOG);
+	close(OUTLOG);
+
+	system( "$mail $Tinderbox_server < ${logfile}.last" )
+	    if ($ReportStatus );
+	unlink("$logfile");
+	
+	# if this is a test run, set early_exit to 0. 
+	#This mean one loop of execution
+	$EarlyExit++ if ($BuildOnce);
+    }
+    
+} #EndSub-BuildIt
+
+sub CVSTime {
+    my($StartTimeArg) = @_;
+    my($RetTime, $StartTimeArg, $sec, $minute, $hour, $mday, $mon, $year);
+    
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime($StartTimeArg);
+    $mon++; # month is 0 based.
+    
+    sprintf("%02d/%02d/%02d %02d:%02d:00", $mon,$mday,$year,$hour,$minute );
+}
+
+sub StartBuild {
+    
+    my($fe, @felist);
+
+    @felist = split(/,/, $FE);
+
+#    die "SERVER: " . $Tinderbox_server . "\n";
+    open( LOG, "|$mail $Tinderbox_server" );
+    foreach $fe ( @felist ) {
+	print LOG "\n";
+	print LOG "tinderbox: tree: $BuildTree\n";
+	print LOG "tinderbox: builddate: $StartTime\n";
+	print LOG "tinderbox: status: building\n";
+	print LOG "tinderbox: build: $BuildName $fe\n";
+	print LOG "tinderbox: errorparser: unix\n";
+	print LOG "tinderbox: buildfamily: unix\n";
+	print LOG "tinderbox: END\n";
+	print LOG "\n";
+    }
+    close( LOG );
+}
+
+# check for the existence of the binary
+sub BinaryExists {
+    my($fe) = @_;
+    my($Binname);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/'. $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG $BinName . "\n"; 
+    if ((-e $BinName) && (-x $BinName) && (-s $BinName)) {
+	1;
+    }
+    else {
+	0;
+    }
+}
+
+sub DeleteBinary {
+    my($fe) = @_;
+    my($BinName);
+    $fe = 'x' if (!defined($fe)); 
+
+    if ($BuildClassic) {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . "/cmd/${fe}fe/" . $BinaryName{"$fe"};
+    } else {
+	$BinName = $BuildDir . '/' . $TopLevel . '/' . $Topsrcdir . '/' . $BuildObjName . $BinaryName{"$fe"};
+    }
+    print LOG "unlinking $BinName\n";
+    unlink ($BinName) || print LOG "unlinking $BinName failed\n";
+}
+
+sub ParseArgs {
+    my($i, $manArg);
+
+    if( @ARGV == 0 ) {
+	&PrintUsage;
+    }
+    $i = 0;
+    $manArg = 0;
+    while( $i < @ARGV ) {
+	if ($ARGV[$i] eq '--depend') {
+	    $BuildDepend = 1;
+ 	    $manArg++;
+	}
+	elsif ($ARGV[$i] eq '--clobber') {
+	    $BuildDepend = 0;
+	    $manArg++;
+	}
+	elsif ( $ARGV[$i] eq '--once' ) {
+	    $BuildOnce = 1;
+	    #$ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--classic') {
+	    $BuildClassic = 1;
+	}
+	elsif ($ARGV[$i] eq '--noreport') {
+	    $ReportStatus = 0;
+	}
+	elsif ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
+	    die "$0: version $Version\n";
+	}
+	elsif ( $ARGV[$i] eq '-tag' ) {
+	    $i++;
+	    $BuildTag = $ARGV[$i];
+	    if ( $BuildTag eq '' || $BuildTag eq '-t') {
+		&PrintUsage;
+	    }
+	}
+	elsif ( $ARGV[$i] eq '-t' ) {
+	    $i++;
+	    $BuildTree = $ARGV[$i];
+	    if ( $BuildTree eq '' ) {
+		&PrintUsage;
+	    }
+	} else {
+	    &PrintUsage;
+	}
+
+	$i++;
+    } #EndWhile
+
+    if ( $BuildTree =~ /^\s+$/i ) {
+	&PrintUsage;
+    }
+
+    if ($BuildDepend eq undef) {
+	&PrintUsage;
+    }
+
+    &PrintUsage if (! $manArg );
+
+} #EndSub-ParseArgs
+
+sub PrintUsage {
+    die "usage: $0 [--depend | --clobber] [-v | --version ] [--once --classic --noreport -tag TREETAG -t TREENAME ]\n";
+}
+
+sub PrintEnv {
+    my ($key);
+    foreach $key (keys %ENV) {
+	print LOG "$key = $ENV{$key}\n";
+	print "$key = $ENV{$key}\n";
+    }
+} #EndSub-PrintEnv
+
+# Main function
+&InitVars;
+&ParseArgs;
+&ConditionalArgs;
+&GetSystemInfo;
+&SetupEnv;
+&SetupPath;
+&BuildIt;
+
+1;

mozilla/webtools/tinderbox/examples/mozilla-windows.pl

@@ -0,0 +1,416 @@
+#!c:/nstools/bin/perl5
+
+use Cwd;
+
+$build_depend=1;      #depend or clobber
+$build_tree = '';
+$build_tag = '';
+$build_name = '';
+$build_continue = 0;
+$build_sleep=10;
+$no32 = 0;
+$no16 = 0;
+$original_path = $ENV{'PATH'};
+$early_exit = 1;
+$doawt11 = 0;
+
+$do_clobber = '';
+$client_param = 'pull_and_build_all';
+
+&parse_args;
+
+if( $build_test ){
+    $build_sleep=1;
+}
+
+$dirname = ($build_depend?'dep':'clob');
+
+
+$logfile = "${dirname}.log";
+
+if( $build_depend ){
+    $clobber_str = 'depend';
+}     
+else {
+    $clobber_str = 'clobber_all';
+}
+
+
+mkdir("$dirname", 0777);
+chdir("$dirname") || die "couldn't cd to $dirname";
+
+$start_dir = cwd;
+$last_time = 0;
+
+print "starting dir is :$start_dir\n";
+
+
+while( $early_exit ){
+    chdir("$start_dir");
+    if( time - $last_time < (60 * $build_sleep) ){
+        $sleep_time = (60 * $build_sleep) - (time - $last_time);
+        print "\n\nSleeping $sleep_time seconds ...\n";
+        sleep( $sleep_time );
+    }
+    $last_time = time;
+
+    $start_time = time-60*10;
+    $start_time_str = &cvs_time( $start_time );
+# call setup_env here in the loop, to update MOZ_DATE with each pass.
+# setup_env uses start_time_str for MOZ_DATE.
+    &setup_env;
+
+
+    $cur_dir = cwd;
+
+    if( $cur_dir ne $start_dir ){
+        print "startdir: $start_dir, curdir $cur_dir\n";
+        die "curdir != startdir";
+    }
+
+# build 32-bit with AWT_11=1
+    &setup32("1");
+    if( !$no32 ){
+    	if( !$noawt11 ){
+	    &do_build(1,$do_clobber);
+    	}
+    }
+
+    if ($build_test) {
+	$early_exit = 0;	# stops this while loop after one pass.
+    }
+    if( !$no16 ){
+
+# build 32-bit with AWT_11=0
+# necessary before building 16-bit because 16-bit cannot use AWT 1.1 classes
+	&setup32("0");
+	if( !$no32 ){
+	    if( !$noawt11 ){
+		&do_build(0,'');
+	    } else {
+		&do_build(1,$do_clobber);
+	    }
+	}
+
+        &setup16;
+
+# strip_conf fails to strip any variables from the real environemnt
+#	&strip_config;
+        &do_build(0,'');
+#	&restore_config;
+    }
+}
+
+sub copy_win16_dist {
+
+    system 'xcopy w:\ y:\ns\dist /S /E /F'; 
+    print "COPYCOPYCOPY\n";
+
+}
+
+sub build_NSPR20_Win16 {
+
+    &start_build;
+    unlink( "${logname}.last" );
+    rename( "${logname}","${logname}.last");
+
+    print "opening ${logname}\n";
+    open( LOG, ">${logname}" ) || print "can't open $?\n";
+    print LOG "current dir is :$cur_dir\n";
+
+    &print_env;
+
+    chdir("$moz_src/ns/nspr20") || die "couldn't chdir to '$moz_src/ns/nspr20'";
+    print LOG   "gmake |\n";
+    open( BUILDNSPR, "gmake 2>&1 |") || print "couldn't execute gmake\n";;
+
+    while( <BUILDNSPR> ) {
+        print $_;
+        print LOG $_;
+    }
+    close ( BUILDNSPR );
+
+    close( LOG );
+}
+
+sub setup32 {
+    local ($awt) = @_;
+
+    $ENV{"MOZ_BITS"}  = '32';
+    $ENV{"AWT_11"}    = $awt;
+    $doawt11 	      = $awt;
+
+    $ENV{"INCLUDE"}   = "$msdev\\include;$msdev\\mfc\\include";
+    $ENV{"LIB"}       = "$msdev\\lib;$msdev\\mfc\\lib";
+    $ENV{"PATH"}      = $original_path . ";$msdev\\bin";
+    $ENV{"OS_TARGET"} = 'WIN95';
+    $moz_src          = $ENV{'MOZ_SRC'} = $start_dir;
+    $build_name       = 'Win32 ' . ($build_depend?'Depend':'Clobber');
+    $do_clobber       = $clobber_str;
+    $logname          = "win32.log";
+}
+
+sub setup16 {
+    $moz_src = $ENV{'MOZ_SRC'} = $start_dir;
+    $ENV{"MOZ_BITS"} = '16';
+# perl 5 is fucked up.  you MUST set AWT_11=0. deleting the environment
+# variable doesn't work.  it's removed from the environment entry, but
+# is still defined as true for a build.
+    $ENV{"AWT_11"} = '0';
+    $moz_src = $ENV{'MOZ_SRC'} = "$src_16_drive";
+    $ENV{"OS_TARGET"} = 'WIN16';
+
+    $msvc_inc = "$moz_src\\ns\\msvc15\\include;$moz_src\\ns\\msvc15\\mfc\\include";
+    $msvc_lib = "$msvc\\lib;$msvc\\mfc\\lib";
+    $msvcpath = "$msvc\\bin;c:\\nstools\\bin;c:\\WINNT40;c:\\WINNT40\\system32;c:\\utils";
+    $ENV{"MSVC_INC"} = $msvc_inc;
+    $ENV{"MSVC_LIB"} = $msvc_lib;
+    $ENV{"MSVCPATH"} = $msvcpath;
+
+    $ENV{"INCLUDE"}  = $msvc_inc;
+    $ENV{"LIB"}      = $msvc_lib;
+    $ENV{"PATH"}     = $msvcpath;
+
+    $watcom = $ENV{"WATCOM"} = "C:\\WATCOM";
+    $ENV{"EDPATH"}   = "$watcom\\EDDAT";
+    $ENV{"WATC_INC"} = "$watcom\\h;$watcom\\h\win;$msvc_inc";
+    $ENV{"WATC_LIB"} = $msvc_lib;
+    $ENV{"WATCPATH"} = "$watcom\\BINNT;$watcom\\BINW;c:\\nstools\\bin";
+
+    $build_name = 'Win16 ' . ($build_depend?'Depend':'Clobber');
+    $do_clobber = $clobber_str;
+    $logname = "win16.log";
+
+    system "subst l: /d";
+    system "subst r: /d";
+    system "subst $src_16_drive /d";
+
+    system "subst $src_16_drive $start_dir";
+    system "subst r: $src_16_drive\\ns\\netsite\\ldap\\libraries\\msdos\\winsock";
+    system "subst l: $src_16_drive\\ns\\netsite";
+}
+
+sub do_build {
+    local ($pull, $do_clobber) = @_;
+
+    &start_build;
+
+    print "opening ${logname}\n";
+    open( LOG, ">${logname}" ) || print "can't open $?\n";
+    print LOG "current dir is :$cur_dir\n";
+
+    &print_env;
+    $build_status = 0;
+    if( $pull ){
+	if ( $build_tag eq '' ){
+	    print LOG   "cvs co -D\"$start_time_str\" mozilla/client.mak 2>&1 |\n";
+	    open( PULL, "cvs co -D\"$start_time_str\" mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
+	} else{
+	    print LOG   "cvs co -r $build_tag mozilla/client.mak 2>&1 |\n";
+	    open( PULL, "cvs co -r $build_tag mozilla/client.mak 2>&1 |") || print "couldn't execute cvs\n";;
+	}
+
+        # tee the output
+        while( <PULL> ){
+            print $_;
+            print LOG $_;
+        }
+        close( PULL );
+     
+        $build_status = $?;
+    }
+
+    chdir("$moz_src/mozilla") || die "couldn't chdir to '$moz_src/mozilla'";
+
+    if( $do_clobber ne '' ){
+        print LOG   "nmake -f client.mak $do_clobber |\n";
+        print "nmake -f client.mak $do_clobber |\n";
+        open( PULL, "nmake -f client.mak $do_clobber 2>&1 |") || print "couldn't execute nmake\n";;
+
+        # tee the output
+        while( <PULL> ){
+            print $_;
+            print LOG $_;
+        }
+        close( PULL );
+    }
+
+
+    if (!$pull) {
+      $client_param = 'build_all';
+    }
+    else {
+      $client_param = 'pull_and_build_all';
+    }
+    if (!$doawt11) {
+      $client_param = 'build_dist';
+    }
+    
+    print LOG "nmake  -f client.mak $client_param 2>&1 |\n";
+    open( BUILD, "nmake -f client.mak $client_param 2>&1 |");
+
+    # tee the output
+    while( <BUILD> ){
+        print $_;
+        print LOG $_;
+    }
+    close( BUILD );
+    $build_status |= $?;
+
+    $build_status_str = ( $build_status ? 'busted' : 'success' );
+
+    print LOG "tinderbox: tree: $build_tree\n";
+    print LOG "tinderbox: builddate: $start_time\n";
+    print LOG "tinderbox: status: $build_status_str\n";
+    print LOG "tinderbox: build: $build_name\n";
+    print LOG "tinderbox: errorparser: windows\n";
+    print LOG "tinderbox: buildfamily: windows\n";
+
+    close( LOG );
+    chdir("$start_dir");
+    system( "$nstools\\bin\\blat ${logname} -t tinderbox-daemon\@warp" );
+}
+
+sub cvs_time {
+    local( $ret_time );
+
+    ($sec,$minute,$hour,$mday,$mon,$year) = localtime( $_[0] );
+    $mon++; # month is 0 based.
+
+    sprintf("%02d/%02d/%02d %02d:%02d:00",
+        $mon,$mday,$year,$hour,$minute );
+}
+
+
+sub start_build {
+    open( LOG, ">>logfile" );
+    print LOG "\n";
+    print LOG "tinderbox: tree: $build_tree\n";
+    print LOG "tinderbox: builddate: $start_time\n";
+    print LOG "tinderbox: status: building\n";
+    print LOG "tinderbox: build: $build_name\n";
+    print LOG "tinderbox: errorparser: windows\n";
+    print LOG "tinderbox: buildfamily: windows\n";
+    print LOG "\n";
+    close( LOG );
+    system("$nstools\\bin\\blat logfile -t tinderbox-daemon\@warp" );
+}
+
+sub parse_args {
+    local($i);
+
+    if( @ARGV == 0 ){
+        &usage;
+    }
+    $i = 0;
+    while( $i < @ARGV ){
+        if( $ARGV[$i] eq '--depend' ){
+            $build_depend = 1;
+        }
+        elsif ( $ARGV[$i] eq '--clobber' ){
+            $build_depend = 0;
+        }
+        elsif ( $ARGV[$i] eq '--continue' ){
+            $build_continue = 1;
+        }
+        elsif ( $ARGV[$i] eq '--noawt11' ){
+            $noawt11 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--no32' ){
+            $no32 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--no16' ){
+            $no16 = 1;
+        }
+        elsif ( $ARGV[$i] eq '--test' ){
+            $build_test = 1;
+        }
+        elsif ( $ARGV[$i] eq '-tag' ){
+            $i++;
+            $build_tag = $ARGV[$i];
+            if( $build_tag eq '' || $build_tag eq '-t'){
+                &usage;
+            }
+		}
+        elsif ( $ARGV[$i] eq '-t' ){
+            $i++;
+            $build_tree = $ARGV[$i];
+            if( $build_tree eq '' ){
+                &usage;
+            }
+        }
+        $i++;
+    }
+    if( $build_tree eq '' ){
+        &usage;
+    }
+}
+
+sub usage {
+    die "usage: buildit.pl [--depend | --clobber] [--no16] [--continue] [--test] [-tag TAGNAME] -t TREENAME\n";
+}
+
+sub setup_env {
+    local($p);
+    $ENV{"MOZ_DEBUG"} = '1';
+    $ENV{"MOZ_GOLD"} = '1';
+    $ENV{"NO_SECURITY"} = '1';
+    $ENV{"MOZ_MEDIUM"} = '1';
+    $ENV{"MOZ_CAFE"} = '1';
+    $ENV{"NSPR20"} = '1';
+    $ENV{"VERBOSE"} = '1';
+    $nstools = $ENV{"MOZ_TOOLS"};
+    if( $nstools eq '' ){
+        die "error: environment variable MOZ_TOOLS not set\n";
+    }
+    $msdev = $ENV{"MOZ_MSDEV"} = 'c:\msdev';
+    if( $msdev eq '' ){
+        die "error: environment variable MOZ_MSDEV not set\n";
+    }
+    $msvc = $ENV{"MOZ_MSVC"} = 'c:\msvc';
+    if( $msvc eq '' ){
+        die "error: environment variable MOZ_VC not set\n";
+    }
+    if ( $build_tag ne '' ) {
+	$ENV{"MOZ_BRANCH"} = $build_tag;
+    }
+    $moz_src = $ENV{"MOZ_SRC"} = $start_dir;
+    $ENV{"MOZ_DATE"} = $start_time_str;
+    $src_16_drive = 'y:';
+}
+
+sub print_env {
+    local( $k, $v);
+    print LOG "\nEnvironment\n";
+    print     "\nEnvironment\n";
+    for $k (sort keys %ENV){
+        $v = $ENV{$k};
+        print LOG "   $k=$v\n";
+        print     "   $k=$v\n";
+    }
+    print LOG "\n";
+    print     "\n";
+    system 'set';
+}
+
+sub strip_config {
+	$save_compname=$ENV{"COMPUTERNAME"};
+	$save_userdomain=$ENV{"USERDOMAIN"};
+	$save_username=$ENV{"USERNAME"};
+	$save_userprofile=$ENV{"USERPROFILE"};
+# most of these deletes have no effect.
+	delete($ENV{"COMPUTERNAME"});
+	delete($ENV{"USERDOMAIN"});
+	delete($ENV{"USERNAME"});
+	delete($ENV{"USERPROFILE"});
+#	delete($ENV{"WATCOM"});
+
+}
+
+sub restore_config {
+	$ENV{"COMPUTERNAME"}=$save_compname;
+	$ENV{"USERDOMAIN"}=$save_userdomain;
+	$ENV{"USERNAME"}=$save_username;
+	$ENV{"MSDevDir"}=$save_userprofile;
+	&print_env;
+}

mozilla/webtools/tinderbox/faq.html

@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.0b2 (WinNT; I) [Netscape]">
+</HEAD>
+<BODY>
+
+<H1>
+FAQ on Tinderbox&nbsp;</H1>
+<B><FONT SIZE=+2>Q. What is Tinderbox.</FONT></B>
+<BR><FONT SIZE=+2>A. Your very own automated build page.&nbsp; It shows you how builds
+are going on various platforms. fs</FONT>
+<BR><FONT SIZE=+2></FONT>
+<BR><B><FONT SIZE=+2>Q. I just checked in some code.&nbsp; How can I tell when
+I'm OK.</FONT></B>
+<BR><FONT SIZE=+2>A. You name will appear in the <I>guilty </I>column.&nbsp;
+When there are successful (<FONT COLOR="#00FF00">green</FONT>) builds in
+all the columns in a row <B>above</B> your name, you know you are ok.</FONT>
+<BR>
+<BR><B><FONT SIZE=+2>Q. The tree is broken, how do I find out what is busted
+(or who busted it).</FONT></B>
+<BR><FONT SIZE=+2>A. Clicking 'L' in the first red box (first build to break)
+above a green will show you a build log for the broken build.&nbsp; You
+can also click 'C' in this box and see what code was checked in.</FONT>
+<BR>
+<BR><B><FONT SIZE=+2>More Questions? Mail me <A HREF="mailto:ltabb@netscape.com">ltabb@netscape.com</A></FONT></B>
+<BR>
+
+</BODY>
+</HTML>

mozilla/webtools/tinderbox/fixupimages.pl

@@ -0,0 +1,217 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+use Socket;
+
+require 'globals.pl';
+require 'imagelog.pl';
+
+# Port an old-style imagelog thing to a newstyle one
+
+open( IMAGELOG, "<$data_dir/imagelog.txt" ) || die "can't open file";
+open (OUT, ">$data_dir/newimagelog.txt") || die "can't open output file";
+select(OUT); $| = 1; select(STDOUT);
+
+while( <IMAGELOG> ){
+    chop;
+    ($url,$quote)  = split(/\`/);
+    print "$url\n";
+    $size = &URLsize($url);
+    $width = "";
+    $height = "";
+    if ($size =~ /WIDTH=([0-9]*)/) {
+        $width = $1;
+    }
+    if ($size =~ /HEIGHT=([0-9]*)/) {
+        $height = $1;
+    }
+    if ($width eq "" || $height eq "") {
+        print "Couldn't get image size; skipping.\n";
+    } else {
+        print OUT "$url`$width`$height`$quote\n";
+    }
+}
+
+
+
+
+
+
+sub imgsize {
+    local($file)= @_;
+
+    #first try to open the file
+    if( !open(STREAM, "<$file") ){
+        print "Can't open IMG $file"; 
+        $size="";
+    } else {
+        if ($file =~ /.jpg/i || $file =~ /.jpeg/i) {
+            $size = &jpegsize(STREAM);
+        } elsif($file =~ /.gif/i) {
+            $size = &gifsize(STREAM);
+        } elsif($file =~ /.xbm/i) {
+            $size = &xbmsize(STREAM);
+        } else {
+            return "";
+        }
+        $_ = $size;
+        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+        }
+        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+        }
+        close(STREAM);
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine gets the size of the specified GIF
+###########################################################################
+sub gifsize {
+    local($GIF) = @_;
+    read($GIF, $type, 6); 
+    if(!($type =~ /GIF8[7,9]a/) || 
+       !(read($GIF, $s, 4) == 4) ){
+        print "Invalid or Corrupted GIF"; 
+        $size="";
+    } else {
+        ($a,$b,$c,$d)=unpack("C"x4,$s);
+        $size=join ("", 'WIDTH=', $b<<8|$a, ' HEIGHT=', $d<<8|$c);
+    }
+    return $size;
+}
+
+sub xbmsize {
+    local($XBM) = @_;
+    local($input)="";
+
+    $input .= <$XBM>;
+    $input .= <$XBM>;
+    $_ = $input;
+    if( /#define\s*\S*\s*\d*\s*\n#define\s*\S*\s*\d*\s*\n/i ){
+       ($a,$b)=/#define\s*\S*\s*(\d*)\s*\n#define\s*\S*\s*(\d*)\s*\n/i;
+       $size=join ("", 'WIDTH=', $a, ' HEIGHT=', $b );
+   } else {
+       print "Hmmm... Doesn't look like an XBM file";
+   }
+    return $size;
+}
+
+# jpegsize : gets the width and height (in pixels) of a jpeg file
+# Andrew Tong, werdna@ugcs.caltech.edu           February 14, 1995
+# modified slightly by alex@ed.ac.uk
+sub jpegsize {
+    local($JPEG) = @_;
+    local($done)=0;
+    $size="";
+
+    read($JPEG, $c1, 1); read($JPEG, $c2, 1);
+    if( !((ord($c1) == 0xFF) && (ord($c2) == 0xD8))){
+        printf "This is not a JPEG! (Codes %02X %02X)\n", ord($c1), ord($c2);
+        $done=1;
+    }
+    while (ord($ch) != 0xDA && !$done) {
+        # Find next marker (JPEG markers begin with 0xFF)
+        # This can hang the program!!
+        while (ord($ch) != 0xFF) {  read($JPEG, $ch, 1); }
+        # JPEG markers can be padded with unlimited 0xFF's
+        while (ord($ch) == 0xFF) { read($JPEG, $ch, 1); }
+        # Now, $ch contains the value of the marker.
+            $marker=ord($ch);
+
+            if (($marker >= 0xC0) && ($marker <= 0xCF) &&
+            ($marker != 0xC4) && ($marker != 0xCC)) {  # it's a SOFn marker
+            read ($JPEG, $junk, 3); read($JPEG, $s, 4);
+            ($a,$b,$c,$d)=unpack("C"x4,$s);
+            $size=join("", 'HEIGHT=',$a<<8|$b,' WIDTH=',$c<<8|$d );
+            $done=1;
+        } else {
+            # We **MUST** skip variables, since FF's within variable 
+            # names are NOT valid JPEG markers
+            read ($JPEG, $s, 2); 
+            ($c1, $c2) = unpack("C"x2,$s); 
+            $length = $c1<<8|$c2;
+            if( ($length < 2) ){
+                print "Erroneous JPEG marker length";
+                $done=1;
+            } else {
+                read($JPEG, $junk, $length-2);
+            }
+        }
+    }
+    return $size;
+}
+
+###########################################################################
+# Subroutine grabs a gif from another server and gets its size
+###########################################################################
+
+
+sub URLsize {
+    my ($fullurl) = @_;
+    my($dummy, $dummy, $serverstring, $url) = split(/\//, $fullurl, 4);
+    my($them,$port) = split(/:/, $serverstring);
+    my $port = 80 unless $port;
+    $them = 'localhost' unless $them;
+    my $size="";
+
+    $_=$url;
+    if( /gif/i || /jpeg/i || /jpg/i || /xbm/i ) {
+        my ($remote, $iaddr, $paddr, $proto, $line);
+        $remote = $them;
+        if ($port =~ /\D/) { $port = getservbyname($port, 'tcp') }
+        die "No port" unless $port;
+        $iaddr   = inet_aton($remote)               || die "no host: $remote";
+        $paddr   = sockaddr_in($port, $iaddr);
+
+        $proto   = getprotobyname('tcp');
+        socket(S, PF_INET, SOCK_STREAM, $proto)  || return "socket: $!";
+        connect(S, $paddr)    || return "connect: $!";
+        select(S); $| = 1; select(STDOUT);
+
+
+
+        print S "GET /$url\n";
+        if ($url =~ /.jpg/i || $url =~ /.jpeg/i) {
+            $size = &jpegsize(S);
+        } elsif($url =~ /.gif/i) {
+            $size = &gifsize(S);
+        } elsif($url =~ /.xbm/i) {
+            $size = &xbmsize(S);
+        } else {
+            return "";
+        }               
+        $_ = $size;
+        if(  /\s*width\s*=\s*([0-9]*)\s*/i ){
+            ($newwidth)= /\s*width\s*=\s*(\d*)\s*/i;
+        }
+        if(  /\s*height\s*=\s*([0-9]*)\s*/i ){
+            ($newheight)=/\s*height\s*=\s*(\d*)\s*/i;
+        }
+    } else {
+        $size="";
+    }
+    return $size;
+}
+
+sub dokill {
+    kill 9,$child if $child;
+}

mozilla/webtools/tinderbox/globals.pl

@@ -0,0 +1,556 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+#
+# Global variabls and functions for tinderbox
+#
+
+#
+# Global variables
+#
+
+$td1 = {};
+$td2 = {};
+
+$build_list = [];           # array of all build records
+$build_name_index = {};
+$ignore_builds = {};
+$build_name_names = [];
+$name_count = 0;
+
+$build_time_index = {};
+$build_time_times = [];
+$time_count = 0;
+$mindate_time_count = 0;  # time_count that corresponds to the mindate
+
+$build_table = [];
+$who_list = [];
+$who_list2 = [];
+@note_array = ();
+
+
+#$body_tag = "<BODY TEXT=#000000 BGCOLOR=#8080C0 LINK=#FFFFFF VLINK=#800080 ALINK=#FFFF00>";
+#$body_tag = "<BODY TEXT=#000000 BGCOLOR=#FFFFC0 LINK=#0000FF VLINK=#800080 ALINK=#FF00FF>";
+if( $ENV{'USERNAME'} eq 'ltabb' ){
+    $gzip = 'gzip';
+}
+else {
+    $gzip = '/usr/local/bin/gzip';
+}
+
+$data_dir='data';
+
+$lock_count = 0;
+
+1;
+
+sub lock{
+    #if( $lock_count == 0 ){
+    #    print "locking $tree/LOCKFILE.lck\n";
+    #    open( LOCKFILE_LOCK, ">$tree/LOCKFILE.lck" );
+    #    flock( LOCKFILE_LOCK, 2 );
+    #}
+    #$lock_count++;
+
+}
+
+sub unlock{
+    #$lock_count--;
+    #if( $lock_count == 0 ){
+    #    flock( LOCKFILE_LOCK, 8 );
+    #    close( LOCKFILE_LOCK );
+    #}
+}
+
+sub print_time {
+  my ($t) = @_;
+  my ($minute,$hour,$mday,$mon);
+  (undef,$minute,$hour,$mday,$mon,undef) = localtime($t);
+  sprintf("%02d/%02d&nbsp;%02d:%02d",$mon+1,$mday,$hour,$minute);
+}
+
+sub url_encode {
+  my ($s) = @_;
+
+  $s =~ s/\%/\%25/g;
+  $s =~ s/\=/\%3d/g;
+  $s =~ s/\?/\%3f/g;
+  $s =~ s/ /\%20/g;
+  $s =~ s/\n/\%0a/g;
+  $s =~ s/\r//g;
+  $s =~ s/\"/\%22/g;
+  $s =~ s/\'/\%27/g;
+  $s =~ s/\|/\%7c/g;
+  $s =~ s/\&/\%26/g;
+  return $s;
+}
+
+sub url_decode {
+  my ($value) = @_;
+  $value =~ tr/+/ /;
+  $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+  return $value;
+}
+
+
+sub value_encode {
+  my ($s) = @_;
+  $s =~ s@&@&amp;@g;
+  $s =~ s@<@&lt;@g;
+  $s =~ s@>@&gt;@g;
+  $s =~ s@\"@&quot;@g;
+  return $s;
+}
+
+
+sub load_data {
+  $tree2 = $form{'tree2'};
+  if( $tree2 ne '' ){
+    require "$tree2/treedata.pl";
+    if( -r "$tree2/ignorebuilds.pl" ){
+      require "$tree2/ignorebuilds.pl";
+    }
+
+    $td2 = {};
+    $td2->{name} = $tree2;
+    $td2->{cvs_module} = $cvs_module;
+    $td2->{cvs_branch} = $cvs_branch;
+    $td2->{num} = 1;
+    $td2->{ignore_builds} = $ignore_builds;
+    if( $cvs_root eq '' ){
+      $cvs_root = '/m/src';
+    }
+    $td2->{cvs_root} = $cvs_root;
+    
+    $tree = $form{'tree'};
+    require "$tree/treedata.pl";
+    if( $cvs_root eq '' ){
+      $cvs_root = '/m/src';
+    }
+  }
+
+  $tree = $form{'tree'};
+
+  return unless $tree;
+  #die "the 'tree' parameter must be provided\n" unless $tree;
+  
+  if ( -r "$tree/treedata.pl" ) {
+    require "$tree/treedata.pl";
+  }
+
+  $ignore_builds = {};
+  if( -r "$tree/ignorebuilds.pl" ){
+    require "$tree/ignorebuilds.pl";
+  }
+        
+  $td1 = {};
+  $td1->{name} = $tree;
+  $td1->{num} = 0;
+  $td1->{cvs_module} = $cvs_module;
+  $td1->{cvs_branch} = $cvs_branch;
+  $td1->{ignore_builds} = $ignore_builds;
+  if( $cvs_root eq '' ){
+    $cvs_root = '/m/src';
+  }
+  $td1->{cvs_root} = $cvs_root;
+
+  &lock;
+  &load_buildlog;
+  &unlock;
+  
+  &get_build_name_index;
+  &get_build_time_index;
+  
+  &load_who($who_list, $td1);
+  if( $tree2 ne '' ){
+    &load_who($who_list2, $td2);
+  }
+
+  &make_build_table;
+}
+
+sub load_buildlog {
+  my $mailtime, $buildtime, $buildname, $errorparser;
+  my $buildstatus, $logfile,$binaryname;
+  my $buildrec, @treelist, $t;
+
+  if (not defined $maxdate) {
+    $maxdate = time();
+  }
+  if (not defined $mindate) {
+    $mindate = $maxdate - 24*60*60;
+  }
+  
+  if ($tree2 ne '') { 
+    @treelist = ($td1, $td2);
+  }
+  else {
+    @treelist = ($td1);
+  }
+  
+  for $t (@treelist) {
+    use Backwards;
+    my ($bw) = Backwards->new("$t->{name}/build.dat") or die;
+
+    my $tooearly = 0;
+    while( $_ = $bw->readline ) {
+      chomp;
+      ($mailtime, $buildtime, $buildname,
+       $errorparser, $buildstatus, $logfile, $binaryname) = split /\|/;
+
+      # Ignore stuff in the future.
+      next if $buildtime > $maxdate;
+
+      # Ignore stuff in the past (but get a 2 hours of extra data)
+      if ($buildtime < $mindate - 2*60*60) {
+        # Occasionally, a build might show up with a bogus time.  So,
+        # we won't judge ourselves as having hit the end until we
+        # hit a full 20 lines in a row that are too early.
+        last if $tooearly++ > 20;
+
+        next;
+      }
+      $tooearly = 0;
+      $buildrec = {    
+         mailtime    => $mailtime,
+         buildtime   => $buildtime,
+         buildname   => ($tree2 ne '' ? $t->{name} . ' ' : '' ) . $buildname,
+         errorparser => $errorparser,
+         buildstatus => $buildstatus,
+         logfile     => $logfile,
+         binaryname  => $binaryname,
+         td          => $t
+      };
+      if ($form{noignore} or not $t->{ignore_builds}->{$buildname}) {
+        push @{$build_list}, $buildrec;
+      }
+    }
+  }
+}
+
+sub loadquickparseinfo {
+  my ($tree, $build, $times) = (@_);
+
+  do "$tree/ignorebuilds.pl";
+    
+  use Backwards;
+
+  my ($bw) = Backwards->new("$form{tree}/build.dat") or die;
+    
+  my $latest_time = 0;
+  my $tooearly = 0;
+  while( $_ = $bw->readline ) {
+    chop;
+    my ($buildtime, $buildname, $buildstatus) = (split /\|/)[1,2,4];
+    
+    if ($buildstatus =~ /^success|busted|testfailed$/) {
+
+      # Ignore stuff in the future.
+      next if $buildtime > $maxdate;
+
+      $latest_time = $buildtime if $buildtime > $latest_time;
+
+      # Ignore stuff more than 12 hours old
+      if ($buildtime < $latest_time - 12*60*60) {
+        # Hack: A build may give a bogus time. To compensate, we will
+        # not stop until we hit 20 consecutive lines that are too early.
+
+        last if $tooearly++ > 20;
+        next;
+      }
+      $tooearly = 0;
+
+      next if exists $ignore_builds->{$buildname};
+      next if exists $build->{$buildname}
+              and $times->{$buildname} >= $buildtime;
+      
+      $build->{$buildname} = $buildstatus;
+      $times->{$buildname} = $buildtime;
+    }
+  }
+}
+
+sub load_who {
+  my ($who_list, $td) = @_;
+  my $d, $w, $i, $bfound;
+  
+  open(WHOLOG, "<$td->{name}/who.dat");
+  while (<WHOLOG>) {
+    $i = $time_count;
+    chop;
+    ($d,$w) = split /\|/;
+    $bfound = 0;
+    while ($i > 0 and not $bfound) {
+      if ($d <= $build_time_times->[$i]) {
+        $who_list->[$i+1]->{$w} = 1;
+        $bfound = 1;
+      }
+      else {
+        $i--;
+      }
+    }
+  }
+
+  # Ignore the last one
+  #
+  if ($time_count > 0) {
+    $who_list->[$time_count] = {};
+  }
+}
+    
+sub get_build_name_index {
+  my $i,$br;
+
+  # Get all the unique build names.
+  #
+  foreach $br (@{$build_list}) {
+    $build_name_index->{$br->{buildname}} = 1;
+  }
+    
+  $i = 1;
+  foreach $n (sort keys (%{$build_name_index})) {
+    $build_name_names->[$i] = $n;
+    $i++;
+  }
+
+  $name_count = @{$build_name_names}-1;
+
+  # Update the map so it points to the right index
+  #
+  for ($i=1; $i < $name_count+1; $i++) {
+    $build_name_index->{$build_name_names->[$i]} = $i;
+  }
+}
+
+sub get_build_time_index {
+  my $i,$br;
+
+  # Get all the unique build names.
+  #
+  foreach $br (@{$build_list}) {
+    $build_time_index->{$br->{buildtime}} = 1;
+  }
+
+  $i = 1;
+  foreach $n (sort {$b <=> $a} keys (%{$build_time_index})) {
+    $build_time_times->[$i] = $n;
+    $mindate_time_count = $i if $n >= $mindate;
+    $i++;
+  }
+
+  $time_count = @{$build_time_times}-1;
+
+  # Update the map so it points to the right index
+  #
+  for ($i=1; $i < $time_count+1; $i++) {
+    $build_time_index->{$build_time_times->[$i]} = $i;
+  }
+  
+  #for $i (@{$build_time_times}) {
+  #    print $i . "\n";
+  #}
+  
+  #while( ($k,$v) = each(%{$build_time_index})) {
+  #    print "$k=$v\n";
+  #}
+}
+
+sub make_build_table {
+  my $i,$ti,$bi,$ti1,$br;
+
+  # Create the build table
+  #
+  for ($i=1; $i <= $time_count; $i++){
+    $build_table->[$i] = [];
+  }
+
+  # Populate the build table with build data
+  #
+  foreach $br (reverse @{$build_list}) {
+    $ti = $build_time_index->{$br->{buildtime}};
+    $bi = $build_name_index->{$br->{buildname}};
+    $build_table->[$ti][$bi] = $br;
+  }
+
+  &load_notes;
+
+  for ($bi = $name_count; $bi > 0; $bi--) {
+    for ($ti = $time_count; $ti > 0; $ti--) {
+      if (defined($br = $build_table->[$ti][$bi])
+          and not defined($br->{rowspan})) {
+
+        # If the cell immediately after us is defined, then we 
+        #  can have a previousbuildtime.
+        if (defined($br1 = $build_table->[$ti+1][$bi])) {
+          $br->{previousbuildtime} = $br1->{buildtime};
+        }
+                                
+        $ti1 = $ti-1;
+        while ($ti1 > 0 and not defined($build_table->[$ti1][$bi])) {
+          $build_table->[$ti1][$bi] = -1;
+          $ti1--;
+        }
+        $br->{rowspan} = $ti - $ti1;
+        if ($br->{rowspan} != 1) {
+          $build_table->[$ti1+1][$bi] = $br;
+          $build_table->[$ti][$bi] = -1;
+        }
+      }
+    }
+  }
+}
+
+sub load_notes {
+  if ($tree2 ne '') { 
+    @treelist = ($td1, $td2);
+  }
+  else {
+    @treelist = ($td1);
+  }
+
+  foreach $t (@treelist) {
+    open(NOTES,"<$t->{name}/notes.txt") 
+      or print "<h2>warning: Couldn't open $t->{name}/notes.txt </h2>\n";
+    while (<NOTES>) {
+      chop;
+      ($nbuildtime,$nbuildname,$nwho,$nnow,$nenc_note) = split /\|/;
+      $nbuildname = "$t->{name} $nbuildname" if $tree2 ne '';
+      $ti = $build_time_index->{$nbuildtime};
+      $bi = $build_name_index->{$nbuildname};
+      #print "[ti = $ti][bi=$bi][buildname='$nbuildname' $_<br>";
+      if ($ti != 0 and $bi != 0) {
+        $build_table->[$ti][$bi]->{hasnote} = 1;
+        if (not defined($build_table->[$ti][$bi]->{noteid})) {
+          $build_table->[$ti][$bi]->{noteid} = (0+@note_array);
+        }
+        $noteid = $build_table->[$ti][$bi]->{noteid};
+        $now_str = &print_time($nnow);
+        $note = &url_decode($nenc_note);
+        $note_array[$noteid] = "<pre>\n[<b><a href=mailto:$nwho>"
+             ."$nwho</a> - $now_str</b>]\n$note\n</pre>"
+             .$note_array[$noteid];
+      }
+    }
+    close(NOTES);
+  }
+}
+
+sub last_success_time {
+  my ($row) = @_;
+
+  for (my $tt=1; $tt <= $time_count; $tt++) {
+    my $br = $build_table->[$tt][$row];
+    next unless defined $br;
+    next unless $br->{buildstatus} eq 'success';
+    return $build_time_times->[$tt + $br->{rowspan} ];
+  }
+  return 0;
+}
+
+sub last_status {
+  my ($row) = @_;
+
+  for (my $tt=1; $tt <= $time_count; $tt++) {
+    my $br = $build_table->[$tt][$row];
+    next unless defined $br;
+    next unless $br->{buildstatus} =~ /^(success|busted|testfailed)$/;
+    return $br->{buildstatus};
+  }
+  return 'building';
+}
+
+sub check_password {
+  if ($form{password} eq '') {
+    if (defined $cookie_jar{tinderbox_password}) {
+      $form{password} = $cookie_jar{tinderbox_password};
+    }
+  }
+  my $correct = '';
+    if (open(REAL, '<data/passwd')) {
+      $correct = <REAL>;
+      close REAL;
+      $correct =~ s/\s+$//;   # Strip trailing whitespace.
+    }
+  $form{password} =~ s/\s+$//;      # Strip trailing whitespace.
+  if ($form{password} ne '') {
+    open(TRAPDOOR, "../bonsai/data/trapdoor $form{'password'} |") 
+      or die "Can't run trapdoor func!";
+    my $encoded = <TRAPDOOR>;
+    close TRAPDOOR;
+    $encoded =~ s/\s+$//;   # Strip trailing whitespace.
+    if ($encoded eq $correct) {
+      if ($form{rememberpassword} ne '') {
+        print "Set-Cookie: tinderbox_password=$form{'password'} ;"
+             ." path=/ ; expires = Sun, 1-Mar-2020 00:00:00 GMT\n";
+      }
+      return;
+    }
+  }
+
+  require 'header.pl';
+
+  print "Content-type: text/html\n";
+  print "Set-Cookie: tinderbox_password= ; path=/ ; "
+       ." expires = Sun, 1-Mar-2020 00:00:00 GMT\n";
+  print "\n";
+
+  EmitHtmlHeader("What's the magic word?",
+                 "You need to know the magic word to use this page.");
+
+  if ($form{password} ne '') {
+    print "<B>Invalid password; try again.<BR></B>";
+  }
+  print q(
+    <FORM method=post>
+    <B>Password:</B>
+    <INPUT NAME=password TYPE=password><BR>
+    <INPUT NAME=rememberpassword TYPE=checkbox>
+    If correct, remember password as a cookie<BR>
+  );
+    
+  while (my ($key,$value) = each %form) {
+    next if $key eq "password" or $key eq "rememberpassword";
+
+    my $enc = value_encode($value);
+    print "<INPUT TYPE=HIDDEN NAME=$key VALUE='$enc'>\n";
+  }
+  print "<INPUT TYPE=SUBMIT value=Submit></FORM>\n";
+  exit;
+}
+
+sub find_build_record {
+  my ($tree, $logfile) = @_;
+
+  my $log_entry = `grep $logfile $tree/build.dat`;
+
+  chomp($log_entry);
+  my ($mailtime, $buildtime, $buildname, $errorparser,
+      $buildstatus, $logfile, $binaryname) = split /\|/, $log_entry;
+
+  $buildrec = {    
+    mailtime    => $mailtime,
+    buildtime   => $buildtime,
+    buildname   => $buildname,
+    errorparser => $errorparser,
+    buildstatus => $buildstatus,
+    logfile     => $logfile,
+    binaryname  => $binaryname,
+    td          => undef
+  };
+  return $buildrec;
+}

mozilla/webtools/tinderbox/handlemail.pl

@@ -0,0 +1,49 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+# Figure out which directory tinderbox is in by looking at argv[0].  Unless
+# there is a command line argument; if there is, just use that.
+
+$tinderboxdir = $0;
+$tinderboxdir =~ s:/[^/]*$::;      # Remove last word, and slash before it.
+if ($tinderboxdir eq "") {
+    $tinderboxdir = ".";
+}
+
+if (@ARGV > 0) {
+    $tinderboxdir = $ARGV[0];
+}
+
+print "tinderbox = $tinderboxdir\n"; 
+
+chdir $tinderboxdir || die "Couldn't chdir to $tinderboxdir"; 
+
+
+open(DF, ">data/tbx.$$") || die "could not open data/tbx.$$";
+while(<STDIN>){
+    print DF $_;
+}
+close(DF);
+
+$err = system("./processbuild.pl data/tbx.$$");
+
+if( $err ) {
+    die "processbuild.pl returned an error\n";
+}
+

mozilla/webtools/tinderbox/imagelog.pl

@@ -0,0 +1,43 @@
+#!/usr/bonsaitools/bin/perl --
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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 the Tinderbox build tool.
+#
+# 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.
+
+1;
+
+sub add_imagelog {
+    local($url,$quote,$width,$height) = @_;
+    open( IMAGELOG, ">>$data_dir/imagelog.txt" ) || die "Oops; can't open imagelog.txt";
+    print IMAGELOG "$url`$width`$height`$quote\n";
+    close( IMAGELOG );
+}
+
+sub get_image{
+    local(@log,@ret,$i);
+
+    open( IMAGELOG, "<$data_dir/imagelog.txt" );
+    @log = <IMAGELOG>;
+
+    # return a random line
+    srand;
+    @ret = split(/\`/,$log[rand @log]);
+
+    close( IMAGELOG );
+    @ret;
+}
+
+