move the typedef of nscolor to gfx_color in to gfxcompat.h. change the typedef of gfx_color to PRUint32 from unsigned long just to make it explicit

gfx/idl/gfxtypes.idl

@@ -60,11 +60,9 @@ typedef float               gfx_angle;
  * A color is a 32 bit unsigned integer with
  * four components: R, G, B and A.
  *
- * @var typedef unsigned long gfx_color
+ * @var typedef PRUint32 gfx_color
  */
-typedef unsigned long       gfx_color;
-
-typedef gfx_color nscolor;
+typedef PRUint32            gfx_color;
 
 /**
  * typedef that should be used for bit depths

gfx/public/gfxcompat.h

@@ -1,35 +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>
- */
-
-/**
- * gfx ifdef file to make gfx2 and gfx live together
- * @file gfxcompat.h
- */
-
-#ifdef GFX2_ONLY
-typedef gfx_coord           nscoord;
-// add these later, work out the include deps, etc.
-//typedef nsRect2             nsRect;
-//typedef nsSize2             nsSize2;
-#endif
-

gfx/public/gfxtypes.idl

@@ -60,11 +60,9 @@ typedef float               gfx_angle;
  * A color is a 32 bit unsigned integer with
  * four components: R, G, B and A.
  *
- * @var typedef unsigned long gfx_color
+ * @var typedef PRUint32 gfx_color
  */
-typedef unsigned long       gfx_color;
-
-typedef gfx_color nscolor;
+typedef PRUint32            gfx_color;
 
 /**
  * typedef that should be used for bit depths

gfx2/public/gfxcompat.h

@@ -1,35 +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>
- */
-
-/**
- * gfx ifdef file to make gfx2 and gfx live together
- * @file gfxcompat.h
- */
-
-#ifdef GFX2_ONLY
-typedef gfx_coord           nscoord;
-// add these later, work out the include deps, etc.
-//typedef nsRect2             nsRect;
-//typedef nsSize2             nsSize2;
-#endif
-

gfx2/public/gfxtypes.idl

@@ -60,11 +60,9 @@ typedef float               gfx_angle;
  * A color is a 32 bit unsigned integer with
  * four components: R, G, B and A.
  *
- * @var typedef unsigned long gfx_color
+ * @var typedef PRUint32 gfx_color
  */
-typedef unsigned long       gfx_color;
-
-typedef gfx_color nscolor;
+typedef PRUint32            gfx_color;
 
 /**
  * typedef that should be used for bit depths

gfx2/public/nsIImage.idl

@@ -31,7 +31,7 @@ interface nsIDrawable;
  *
  * @author Tim Rowley <tor@cs.brown.edu>
  * @author Stuart Parmenter <pavlov@netscape.com>
- * @version 1.1
+ * @version 1.2
  * @see "gfx2"
  */
 [scriptable, uuid(5e8405a4-1dd2-11b2-8385-bc8e3446cad3)]
@@ -83,6 +83,9 @@ interface nsIImage : nsISupports
 
   readonly attribute unsigned long bytesPerRow;
 
+  /**
+   * returns the number of bytes allocated for the image
+   */
   readonly attribute unsigned long bitsLength;