Bug 793408 - Remove some prtypes.h #includes from gfx; r=jrmuizel

gfx/ipc/SharedDIB.h

@@ -7,7 +7,6 @@
 #define gfx_SharedDIB_h__
 
 #include "base/shared_memory.h"
-#include "prtypes.h"
 #include "nscore.h"
 
 namespace mozilla {

gfx/thebes/gfxCoreTextShaper.cpp

@@ -5,7 +5,6 @@
 
 #include "mozilla/Util.h"
 
-#include "prtypes.h"
 #include "nsAlgorithm.h"
 #include "prmem.h"
 #include "nsString.h"

gfx/thebes/gfxFont.cpp

@@ -18,7 +18,6 @@
 #include "gfxPlatform.h"
 #include "nsGkAtoms.h"
 
-#include "prtypes.h"
 #include "gfxTypes.h"
 #include "nsAlgorithm.h"
 #include "gfxContext.h"

gfx/thebes/gfxFont.h

@@ -6,7 +6,6 @@
 #ifndef GFX_FONT_H
 #define GFX_FONT_H
 
-#include "prtypes.h"
 #include "nsAlgorithm.h"
 #include "gfxTypes.h"
 #include "nsString.h"

gfx/thebes/gfxFontFeatures.h

@@ -7,8 +7,6 @@
 #ifndef GFX_FONT_FEATURES_H
 #define GFX_FONT_FEATURES_H
 
-#include "prtypes.h"
-
 // An OpenType feature tag and value pair
 struct gfxFontFeature {
     uint32_t mTag; // see http://www.microsoft.com/typography/otspec/featuretags.htm

gfx/thebes/gfxFontMissingGlyphs.h

@@ -6,7 +6,6 @@
 #ifndef GFX_FONTMISSINGGLYPHS_H
 #define GFX_FONTMISSINGGLYPHS_H
 
-#include "prtypes.h"
 #include "gfxTypes.h"
 #include "gfxContext.h"
 #include "gfxRect.h"

gfx/thebes/gfxFontUtils.h

@@ -9,7 +9,6 @@
 #include "gfxTypes.h"
 #include "gfxPlatform.h"
 
-#include "prtypes.h"
 #include "nsAlgorithm.h"
 #include "prcpucfg.h"
 

gfx/thebes/gfxGraphiteShaper.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prtypes.h"
 #include "prmem.h"
 #include "nsString.h"
 #include "nsBidiUtils.h"

gfx/thebes/gfxHarfBuzzShaper.cpp

@@ -3,7 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "prtypes.h"
 #include "nsAlgorithm.h"
 #include "prmem.h"
 #include "nsString.h"

gfx/thebes/gfxPlatform.h

@@ -6,7 +6,6 @@
 #ifndef GFX_PLATFORM_H
 #define GFX_PLATFORM_H
 
-#include "prtypes.h"
 #include "prlog.h"
 #include "nsTArray.h"
 #include "nsStringGlue.h"

gfx/thebes/gfxSkipChars.h

@@ -6,7 +6,6 @@
 #ifndef GFX_SKIP_CHARS_H
 #define GFX_SKIP_CHARS_H
 
-#include "prtypes.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 #include "gfxTypes.h"

gfx/thebes/gfxTypes.h

@@ -6,7 +6,6 @@
 #ifndef GFX_TYPES_H
 #define GFX_TYPES_H
 
-#include "prtypes.h"
 #include "nsAtomicRefcnt.h"
 
 /**

gfx/ycbcr/chromium_types.h

@@ -5,12 +5,13 @@
 #ifndef GFX_CHROMIUMTYPES_H
 #define GFX_CHROMIUMTYPES_H
 
-#include "prtypes.h"
 #include "mozilla/StandardInteger.h"
 
 typedef uint8_t uint8;
 typedef int8_t int8;
 typedef int16_t int16;
+typedef uint16_t uint16;
+typedef uint32_t uint32;
 
 // From Chromium build_config.h:
 // Processor architecture detection.  For more info on what's defined, see: