From f1fd529b1cf706d8b90215b166676c01d894b27c Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Sat, 22 Sep 2012 11:34:22 -0400 Subject: [PATCH] Bug 793408 - Remove some prtypes.h #includes from gfx; r=jrmuizel --- gfx/ipc/SharedDIB.h | 1 - gfx/thebes/gfxCoreTextShaper.cpp | 1 - gfx/thebes/gfxFont.cpp | 1 - gfx/thebes/gfxFont.h | 1 - gfx/thebes/gfxFontFeatures.h | 2 -- gfx/thebes/gfxFontMissingGlyphs.h | 1 - gfx/thebes/gfxFontUtils.h | 1 - gfx/thebes/gfxGraphiteShaper.cpp | 1 - gfx/thebes/gfxHarfBuzzShaper.cpp | 1 - gfx/thebes/gfxPlatform.h | 1 - gfx/thebes/gfxSkipChars.h | 1 - gfx/thebes/gfxTypes.h | 1 - gfx/ycbcr/chromium_types.h | 3 ++- 13 files changed, 2 insertions(+), 14 deletions(-) diff --git a/gfx/ipc/SharedDIB.h b/gfx/ipc/SharedDIB.h index f9d80c0549de..0d4e0e4b119d 100644 --- a/gfx/ipc/SharedDIB.h +++ b/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 { diff --git a/gfx/thebes/gfxCoreTextShaper.cpp b/gfx/thebes/gfxCoreTextShaper.cpp index ee3fb2ada87e..9e621eccdd28 100644 --- a/gfx/thebes/gfxCoreTextShaper.cpp +++ b/gfx/thebes/gfxCoreTextShaper.cpp @@ -5,7 +5,6 @@ #include "mozilla/Util.h" -#include "prtypes.h" #include "nsAlgorithm.h" #include "prmem.h" #include "nsString.h" diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp index cf152cda484f..6f8f15d7445d 100644 --- a/gfx/thebes/gfxFont.cpp +++ b/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" diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h index cce4b119d33c..86fd3b507705 100644 --- a/gfx/thebes/gfxFont.h +++ b/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" diff --git a/gfx/thebes/gfxFontFeatures.h b/gfx/thebes/gfxFontFeatures.h index 3e8478deb1de..86085c081f28 100644 --- a/gfx/thebes/gfxFontFeatures.h +++ b/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 diff --git a/gfx/thebes/gfxFontMissingGlyphs.h b/gfx/thebes/gfxFontMissingGlyphs.h index 85769fb3e0db..86aedbf5a02c 100644 --- a/gfx/thebes/gfxFontMissingGlyphs.h +++ b/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" diff --git a/gfx/thebes/gfxFontUtils.h b/gfx/thebes/gfxFontUtils.h index c638196f5a9a..143252c72bd2 100644 --- a/gfx/thebes/gfxFontUtils.h +++ b/gfx/thebes/gfxFontUtils.h @@ -9,7 +9,6 @@ #include "gfxTypes.h" #include "gfxPlatform.h" -#include "prtypes.h" #include "nsAlgorithm.h" #include "prcpucfg.h" diff --git a/gfx/thebes/gfxGraphiteShaper.cpp b/gfx/thebes/gfxGraphiteShaper.cpp index a0f5d3057a06..2578b510fafe 100644 --- a/gfx/thebes/gfxGraphiteShaper.cpp +++ b/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" diff --git a/gfx/thebes/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp index a8fe393cbc7d..a240edafa3cf 100644 --- a/gfx/thebes/gfxHarfBuzzShaper.cpp +++ b/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" diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index decd517e0c5e..ade8965b6bdb 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/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" diff --git a/gfx/thebes/gfxSkipChars.h b/gfx/thebes/gfxSkipChars.h index 00efbf0b5815..47073c7c5e81 100644 --- a/gfx/thebes/gfxSkipChars.h +++ b/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" diff --git a/gfx/thebes/gfxTypes.h b/gfx/thebes/gfxTypes.h index 9172199e3131..3f222405287a 100644 --- a/gfx/thebes/gfxTypes.h +++ b/gfx/thebes/gfxTypes.h @@ -6,7 +6,6 @@ #ifndef GFX_TYPES_H #define GFX_TYPES_H -#include "prtypes.h" #include "nsAtomicRefcnt.h" /** diff --git a/gfx/ycbcr/chromium_types.h b/gfx/ycbcr/chromium_types.h index 96410a8d66bb..029ed7b6ba8c 100644 --- a/gfx/ycbcr/chromium_types.h +++ b/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: