Bug 678451 - Remove unused gfx files (mozilla-decoder.*, gfxIFormats.idl and gfxidltypes.idl). r=joe
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 18 Aug 2011 11:41:26 +0900
changeset 75448 4cfe93ab5d3b4000a407e6591b51ce2fb36212c8
parent 75447 1b6414e98c4e552f8994535e0a5aea26cfd9818d
child 75449 e3a6de4920d05392d320f0ccfdc5074941f4db03
child 75450 53e4d3ac41dfdaa3bd88dbcb8e772e22dd44f585
push id21023
push usermak77@bonardo.net
push dateThu, 18 Aug 2011 09:39:20 +0000
treeherdermozilla-central@f69a10f23bf3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs678451
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 678451 - Remove unused gfx files (mozilla-decoder.*, gfxIFormats.idl and gfxidltypes.idl). r=joe
gfx/src/Makefile.in
gfx/src/gfxIFormats.idl
gfx/src/gfxidltypes.idl
gfx/src/mozilla-decoder.cpp
gfx/src/mozilla-decoder.h
gfx/src/nsCoord.h
gfx/src/nsGfxCIID.h
modules/libpr0n/decoders/nsGIFDecoder2.cpp
modules/libpr0n/decoders/nsGIFDecoder2.h
modules/libpr0n/public/imgIContainerObserver.idl
modules/libpr0n/src/imgFrame.h
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -50,18 +50,16 @@ GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT   = 1
 # This library is used by other shared libs in a static build
 FORCE_USE_PIC  = 1
 
 XPIDLSRCS = \
 	nsIFontEnumerator.idl \
 	nsIScriptableRegion.idl \
-	gfxIFormats.idl \
-	gfxidltypes.idl \
 	$(NULL)
         
 EXPORTS	= \
 	gfxCore.h \
 	gfxCrashReporterUtils.h \
 	nsColor.h \
 	nsColorNames.h \
 	nsColorNameList.h \
deleted file mode 100644
--- a/gfx/src/gfxIFormats.idl
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * gfx image formats.
- * @file gfxIFormats.idl
- */
-
-#include "gfxidltypes.idl"
-
-/**
- * gfxIFormats interface
- *
- * @author Tim Rowley <tor@cs.brown.edu>
- * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 0.0
- * @see gfx_format
- */
-[scriptable, uuid(96d086e6-1dd1-11b2-b6b2-b77b59390247)]
-interface gfxIFormats
-{
-  /**
-   * RGB    - duh...
-   */
-  const gfx_format RGB    = 0;
-
-  /**
-   * BGR    - same as RGB except byteswaped
-   */
-  const gfx_format BGR    = 1;
-
-
-  /**
-   * RGB_A1 - RGB image and 1-bit alpha mask
-   */
-  const gfx_format RGB_A1 = 2;
-
-  /**
-   * BGR_A1 - same as RGB_A1 except byteswaped
-   */
-  const gfx_format BGR_A1 = 3;
-
-
-  /**
-   * RGB_A8 - RGB image and 8-bit alpha image
-   */
-  const gfx_format RGB_A8 = 4;
-
-  /**
-   * BGR_A8 - same as RGB_A8 except byteswaped
-   */
-  const gfx_format BGR_A8 = 5;
-
-
-  /**
-   * RGBA   - packed RGBA image
-   */
-  const gfx_format RGBA   = 6;
-
-  /**
-   * BGRA   - packed RGBA image
-   */
-  const gfx_format BGRA   = 7;
-
-  /**
-   * PAL    - Palette based image data, all opaque colors
-   *		  PRUint32 colormap[256];
-   *		  PRUint8 pixels[width*height];
-   */
-  const gfx_format PAL    = 8;
-
-  /**
-   * PAL_A1 - Palette based image data, with transparency
-   *		  PRUint32 colormap[256];
-   *		  PRUint8 pixels[width*height];
-   */
-  const gfx_format PAL_A1 = 9;
-};
deleted file mode 100644
--- a/gfx/src/gfxidltypes.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Stuart Parmenter <pavlov@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * gfx idl declarations to be used by all gfx interfaces.
- * @file gfxidltypes.idl
- */
-
-#include "nsrootidl.idl"
-
-/**
- * A color is a 32 bit unsigned integer with
- * four components: R, G, B and A.
- *
- * @var typedef PRUint32 gfx_color
- */
-typedef PRUint32            gfx_color;
-
-/**
- * typedef that should be used for bit depths
- * @var typedef unsigned short gfx_depth
- */
-typedef unsigned short      gfx_depth; // is short ok?
-
-/**
- * typedef that should be used for image formats
- * @var typedef long gfx_format
- * @see gfxIFormats
- */
-typedef long                gfx_format;
-
-[ptr] native nsIntRect(nsIntRect);
deleted file mode 100644
--- a/gfx/src/mozilla-decoder.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 Christopher Blizzard
- * <blizzard@mozilla.org>.  Portions created by the Initial Developer
- * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#define PANGO_ENABLE_BACKEND
-#define PANGO_ENABLE_ENGINE
-
-#include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
-#include <pango/pangofc-fontmap.h>
-#include <pango/pangofc-font.h>
-#include <gdk/gdkx.h>
-
-#include "nsString.h"
-#include "nsIPersistentProperties2.h"
-#include "nsNetUtil.h"
-#include "nsReadableUtils.h"
-#include "nsICharsetConverterManager.h"
-#include "nsICharRepresentable.h"
-#include "nsCompressedCharMap.h"
-
-#undef DEBUG_CUSTOM_ENCODER
-
-G_DEFINE_TYPE (MozillaDecoder, mozilla_decoder, PANGO_TYPE_FC_DECODER)
-
-MozillaDecoder *mozilla_decoder_new      (void);
-
-static FcCharSet  *mozilla_decoder_get_charset (PangoFcDecoder *decoder,
-                                                PangoFcFont    *fcfont);
-static PangoGlyph  mozilla_decoder_get_glyph   (PangoFcDecoder *decoder,
-                                                PangoFcFont    *fcfont,
-                                                guint32         wc);
-
-static PangoFcDecoder *mozilla_find_decoder    (FcPattern *pattern,
-                                                gpointer   user_data);
-
-typedef struct _MozillaDecoderPrivate MozillaDecoderPrivate;
-
-#define MOZILLA_DECODER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOZILLA_TYPE_DECODER, MozillaDecoderPrivate))
-
-struct _MozillaDecoderPrivate {
-    char *family;
-    char *encoder;
-    char *cmap;
-    gboolean is_wide;
-    FcCharSet *charset;
-    nsCOMPtr<nsIUnicodeEncoder> uEncoder;
-};
-
-static nsICharsetConverterManager *gCharsetManager = NULL;
-
-static NS_DEFINE_CID(kCharsetConverterManagerCID,
-                     NS_ICHARSETCONVERTERMANAGER_CID);
-
-// Hash tables that hold the custom encodings and custom cmaps used in
-// various fonts.
-GHashTable *encoder_hash = NULL;
-GHashTable *cmap_hash = NULL;
-GHashTable *wide_hash = NULL;
-
-void
-mozilla_decoder_init (MozillaDecoder *decoder)
-{
-}
-
-void
-mozilla_decoder_class_init (MozillaDecoderClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS(klass);
-    PangoFcDecoderClass *parent_class = PANGO_FC_DECODER_CLASS (klass);
-
-    /*   object_class->finalize = test_finalize; */
-
-    parent_class->get_charset = mozilla_decoder_get_charset;
-    parent_class->get_glyph = mozilla_decoder_get_glyph;
-
-    g_type_class_add_private (object_class, sizeof (MozillaDecoderPrivate));
-}
-
-MozillaDecoder *
-mozilla_decoder_new(void)
-{
-    return (MozillaDecoder *)g_object_new(MOZILLA_TYPE_DECODER, NULL);
-}
-
-#ifdef DEBUG_CUSTOM_ENCODER
-void
-dump_hash(char *key, char *val, void *arg)
-{
-    printf("%s -> %s\n", key, val);
-}
-#endif
-
-/**
- * mozilla_decoders_init:
- *
- * #mozilla_decoders_init:
- *
- * This initializes all of the application-specific custom decoders
- * that Mozilla uses.  This should only be called once during the
- * lifetime of the application.
- *
- * Return value: zero on success, not zero on failure.
- *
- **/
-
-int
-mozilla_decoders_init(void)
-{
-    static PRBool initialized = PR_FALSE;
-    if (initialized)
-        return 0;
-
-    encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
-    cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
-    wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
-
-    PRBool dumb = PR_FALSE;
-    nsCOMPtr<nsIPersistentProperties> props;
-    nsCOMPtr<nsISimpleEnumerator> encodeEnum;
-
-    NS_LoadPersistentPropertiesFromURISpec(getter_AddRefs(props),
-        NS_LITERAL_CSTRING("resource://gre/res/fonts/pangoFontEncoding.properties"));
-
-    if (!props)
-        goto loser;
-
-    // Enumerate the properties in this file and figure out all of the
-    // fonts for which we have custom encodings.
-    props->Enumerate(getter_AddRefs(encodeEnum));
-    if (!encodeEnum)
-        goto loser;
-
-    while (encodeEnum->HasMoreElements(&dumb), dumb) {
-        nsCOMPtr<nsIPropertyElement> prop;
-        encodeEnum->GetNext(getter_AddRefs(prop));
-        if (!prop)
-            goto loser;
-
-        nsCAutoString name;
-        prop->GetKey(name);
-        nsAutoString value;
-        prop->GetValue(value);
-
-        if (!StringBeginsWith(name, NS_LITERAL_CSTRING("encoding."))) {
-            printf("string doesn't begin with encoding?\n");
-            continue;
-        }
-
-        name = Substring(name, 9);
-
-        if (StringEndsWith(name, NS_LITERAL_CSTRING(".ttf"))) {
-            name = Substring(name, 0, name.Length() - 4);
-
-            // Strip off a .wide if it's there.
-            if (StringEndsWith(value, NS_LITERAL_STRING(".wide"))) {
-                g_hash_table_insert(wide_hash, g_strdup(name.get()),
-                                    g_strdup("wide"));
-                value = Substring(value, 0, name.Length() - 5);
-            }
-
-            g_hash_table_insert(encoder_hash,
-                                g_strdup(name.get()),
-                                g_strdup(NS_ConvertUTF16toUTF8(value).get()));
-        }
-        else if (StringEndsWith(name, NS_LITERAL_CSTRING(".ftcmap"))) {
-            name = Substring(name, 0, name.Length() - 7);
-            g_hash_table_insert(cmap_hash,
-                                g_strdup(name.get()),
-                                g_strdup(NS_ConvertUTF16toUTF8(value).get()));
-        }
-        else {
-            printf("unknown suffix used for mapping\n");
-        }
-    }
-
-    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
-                                            mozilla_find_decoder,
-                                            NULL,
-                                            NULL);
-
-    initialized = PR_TRUE;
-
-#ifdef DEBUG_CUSTOM_ENCODER
-    printf("*** encoders\n");
-    g_hash_table_foreach(encoder_hash, (GHFunc)dump_hash, NULL);
-
-    printf("*** cmaps\n");
-    g_hash_table_foreach(cmap_hash, (GHFunc)dump_hash, NULL);
-#endif
-
-    return 0;
-
- loser:
-    return -1;
-}
-
-FcCharSet *
-mozilla_decoder_get_charset (PangoFcDecoder *decoder,
-                             PangoFcFont    *fcfont)
-{
-    MozillaDecoderPrivate *priv = MOZILLA_DECODER_GET_PRIVATE(decoder);
-
-    if (priv->charset)
-        return priv->charset;
-
-    // First time this has been accessed.  Populate the charset.
-    priv->charset = FcCharSetCreate();
-
-    if (!gCharsetManager) {
-        CallGetService(kCharsetConverterManagerCID, &gCharsetManager);
-    }
-
-    nsCOMPtr<nsIUnicodeEncoder> encoder;
-    nsCOMPtr<nsICharRepresentable> represent;
-
-    if (!gCharsetManager)
-        goto end;
-
-    gCharsetManager->GetUnicodeEncoderRaw(priv->encoder, getter_AddRefs(encoder));
-    if (!encoder)
-        goto end;
-    
-    encoder->SetOutputErrorBehavior(encoder->kOnError_Replace, nsnull, '?');
-
-    priv->uEncoder = encoder;
-
-    represent = do_QueryInterface(encoder);
-    if (!represent)
-        goto end;
-
-    PRUint32 map[UCS2_MAP_LEN];
-    memset(map, 0, sizeof(map));
-
-    represent->FillInfo(map);
-
-    for (int i = 0; i < NUM_UNICODE_CHARS; i++) {
-        if (IS_REPRESENTABLE(map, i))
-            FcCharSetAddChar(priv->charset, i);
-    }
-
- end:
-    return priv->charset;
-}
-
-PangoGlyph
-mozilla_decoder_get_glyph   (PangoFcDecoder *decoder,
-                             PangoFcFont    *fcfont,
-                             guint32         wc)
-{
-    MozillaDecoderPrivate *priv = MOZILLA_DECODER_GET_PRIVATE(decoder);
-
-    PangoGlyph retval = 0;
-    PRUnichar inchar = wc;
-    PRInt32 inlen = 1;
-    char outchar[2] = {0,0};
-    PRInt32 outlen = 2;
-
-    priv->uEncoder->Convert(&inchar, &inlen, outchar, &outlen);
-    if (outlen != 1) {
-        printf("Warning: mozilla_decoder_get_glyph doesn't support more than one character conversions.\n");
-        return 0;
-    }
-
-    FT_Face face = pango_fc_font_lock_face(fcfont);
-
-#ifdef DEBUG_CUSTOM_ENCODER
-    char *filename;
-    FcPatternGetString(fcfont->font_pattern, FC_FILE, 0, (FcChar8 **)&filename);
-    printf("filename is %s\n", filename);
-#endif
-
-    // Make sure to set the right charmap before trying to get the
-    // glyph
-    if (priv->cmap) {
-        if (!strcmp(priv->cmap, "mac_roman")) {
-            FT_Select_Charmap(face, ft_encoding_apple_roman);
-        }
-        else if (!strcmp(priv->cmap, "unicode")) {
-            FT_Select_Charmap(face, ft_encoding_unicode);
-        }
-        else {
-            printf("Warning: Invalid charmap entry for family %s\n",
-                   priv->family);
-        }
-    }
-
-    // Standard 8 bit to glyph translation
-    if (!priv->is_wide) {
-        FcChar32 blah = PRUint8(outchar[0]);
-        retval = FT_Get_Char_Index(face, blah);
-#ifdef DEBUG_CUSTOM_ENCODER
-        printf("wc 0x%x outchar[0] 0x%x index 0x%x retval 0x%x face %p\n",
-               wc, outchar[0], blah, retval, (void *)face);
-#endif
-    }
-    else {
-        printf("Warning: We don't support .wide fonts!\n");
-        retval = 0;
-    }
-
-    pango_fc_font_unlock_face(fcfont);
-
-    return retval;
-}
-
-PangoFcDecoder *
-mozilla_find_decoder (FcPattern *pattern, gpointer user_data)
-{
-    // Compare the family name of the font that's been opened to see
-    // if we have a custom decoder.
-    const char *orig = NULL;
-    FcPatternGetString(pattern, FC_FAMILY, 0, (FcChar8 **)&orig);
-
-    nsCAutoString family;
-    family.Assign(orig);
-
-    family.StripWhitespace();
-    ToLowerCase(family);
-
-    char *encoder = (char *)g_hash_table_lookup(encoder_hash, family.get());
-    if (!encoder)
-        return NULL;
-
-    MozillaDecoder *decoder = mozilla_decoder_new();
-
-    MozillaDecoderPrivate *priv = MOZILLA_DECODER_GET_PRIVATE(decoder);
-
-    priv->family = g_strdup(family.get());
-    priv->encoder = g_strdup(encoder);
-
-    char *cmap = (char *)g_hash_table_lookup(cmap_hash, family.get());
-    if (cmap)
-        priv->cmap = g_strdup(cmap);
-
-    char *wide = (char *)g_hash_table_lookup(wide_hash, family.get());
-    if (wide)
-        priv->is_wide = TRUE;
-
-    return PANGO_FC_DECODER(decoder);
-}
deleted file mode 100644
--- a/gfx/src/mozilla-decoder.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim:expandtab:shiftwidth=4:tabstop=4:
- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 Christopher Blizzard
- * <blizzard@mozilla.org>.  Portions created by the Initial Developer
- * are Copyright (C) 2004 the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _MOZILLA_DECODER_H
-#define _MOZILLA_DECODER_H
-
-#include <pango/pangofc-decoder.h>
-
-G_BEGIN_DECLS
-
-#define MOZILLA_TYPE_DECODER (mozilla_decoder_get_type())
-#define MOZILLA_DECODER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MOZILLA_TYPE_DECODER, MozillaDecoder))
-#define MOZILLA_IS_DECODER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MOZILLA_TYPE_DECODER))
-
-typedef struct _MozillaDecoder      MozillaDecoder;
-typedef struct _MozillaDecoderClass MozillaDecoderClass;
-
-#define MOZILLA_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_DECODER, MozillaDecoderClass))
-#define MOZILLA_IS_DECODER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZILLA_TYPE_DECODER))
-#define MOZILLA_DECODER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_TYPE_DECODER, MozillaDecoderClass))
-
-struct _MozillaDecoder
-{
-  PangoFcDecoder parent_instance;
-};
-
-struct _MozillaDecoderClass
-{
-  PangoFcDecoderClass parent_class;
-};
-
-GType           mozilla_decoder_get_type (void);
-int             mozilla_decoders_init    (void);
-
-G_END_DECLS
-
-#endif /*_MOZILLA_DECODER_H */
--- a/gfx/src/nsCoord.h
+++ b/gfx/src/nsCoord.h
@@ -51,18 +51,17 @@
  *
  * Normally all coordinates are maintained in an app unit coordinate
  * space. An app unit is 1/60th of a CSS device pixel, which is, in turn
  * an integer number of device pixels, such at the CSS DPI is as close to
  * 96dpi as possible.
  */
 
 // This controls whether we're using integers or floats for coordinates. We
-// want to eventually use floats. If you change this, you need to manually
-// change the definition of nscoord in gfx/src/gfxidltypes.idl.
+// want to eventually use floats.
 //#define NS_COORD_IS_FLOAT
 
 inline float NS_IEEEPositiveInfinity() {
   union { PRUint32 mPRUint32; float mFloat; } pun;
   pun.mPRUint32 = 0x7F800000;
   return pun.mFloat;
 }
 inline PRBool NS_IEEEIsNan(float aF) {
--- a/gfx/src/nsGfxCIID.h
+++ b/gfx/src/nsGfxCIID.h
@@ -37,20 +37,16 @@
 
 #ifndef nsGfxCIID_h__
 #define nsGfxCIID_h__
 
 #define NS_FONT_ENUMERATOR_CID \
 { 0xa6cf9115, 0x15b3, 0x11d2, \
 { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
 
-#define NS_REGION_CID \
-{ 0xe12752f0, 0xee9a, 0x11d1, \
-{ 0xa8, 0x2a, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
 #define NS_SCRIPTABLE_REGION_CID \
 { 0xda5b130a, 0x1dd1, 0x11b2, \
 { 0xad, 0x47, 0xf4, 0x55, 0xb1, 0x81, 0x4a, 0x78 } }
 
 #define NS_GFX_INITIALIZATION_CID \
 { 0x67c41576, 0x9664, 0x4ed5, \
 { 0x90, 0xc1, 0xf6, 0x68, 0x3f, 0xd5, 0x2c, 0x8f } }
 
--- a/modules/libpr0n/decoders/nsGIFDecoder2.cpp
+++ b/modules/libpr0n/decoders/nsGIFDecoder2.cpp
@@ -196,17 +196,17 @@ void nsGIFDecoder2::BeginGIF()
   PostSize(mGIFStruct.screen_width, mGIFStruct.screen_height);
 
   // If we're doing a size decode, we have what we came for
   if (IsSizeDecode())
     return;
 }
 
 //******************************************************************************
-nsresult nsGIFDecoder2::BeginImageFrame(gfx_depth aDepth)
+nsresult nsGIFDecoder2::BeginImageFrame(PRUint16 aDepth)
 {
   PRUint32 imageDataLength;
   nsresult rv;
   gfxASurface::gfxImageFormat format;
   if (mGIFStruct.is_transparent)
     format = gfxASurface::ImageFormatARGB32;
   else
     format = gfxASurface::ImageFormatRGB24;
--- a/modules/libpr0n/decoders/nsGIFDecoder2.h
+++ b/modules/libpr0n/decoders/nsGIFDecoder2.h
@@ -64,17 +64,17 @@ public:
   virtual void WriteInternal(const char* aBuffer, PRUint32 aCount);
   virtual void FinishInternal();
 
 private:
   /* These functions will be called when the decoder has a decoded row,
    * frame size information, etc. */
 
   void      BeginGIF();
-  nsresult  BeginImageFrame(gfx_depth aDepth);
+  nsresult  BeginImageFrame(PRUint16 aDepth);
   void      EndImageFrame();
   void      FlushImageData();
   void      FlushImageData(PRUint32 fromRow, PRUint32 rows);
 
   nsresult  GifWrite(const PRUint8 * buf, PRUint32 numbytes);
   PRUint32  OutputRow();
   PRBool    DoLzw(const PRUint8 *q);
 
--- a/modules/libpr0n/public/imgIContainerObserver.idl
+++ b/modules/libpr0n/public/imgIContainerObserver.idl
@@ -33,23 +33,23 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsISupports.idl"
-#include "gfxidltypes.idl"
 
 %{C++
 #include "nsRect.h"
 %}
 
 interface imgIContainer;
+[ptr] native nsIntRect(nsIntRect);
 
 /**
  * imgIContainerObserver interface
  *
  * @author Stuart Parmenter <pavlov@netscape.com>
  * @version 0.1
  */
 [scriptable, uuid(aa2068c1-6b91-4f52-8603-487b14ac5f04)]
--- a/modules/libpr0n/src/imgFrame.h
+++ b/modules/libpr0n/src/imgFrame.h
@@ -39,17 +39,16 @@
 #ifndef imgFrame_h
 #define imgFrame_h
 
 #include "nsRect.h"
 #include "nsPoint.h"
 #include "nsSize.h"
 #include "gfxTypes.h"
 #include "nsID.h"
-#include "gfxIFormats.h"
 #include "gfxContext.h"
 #include "gfxPattern.h"
 #include "gfxDrawable.h"
 #include "gfxImageSurface.h"
 #if defined(XP_WIN)
 #include "gfxWindowsSurface.h"
 #elif defined(XP_MACOSX)
 #include "gfxQuartzImageSurface.h"