Bug 780260 - Remove PRInt32 types added by the previous changeset. r=ehsan
authorMatt Woodrow <mwoodrow@mozilla.com>
Thu, 23 Aug 2012 14:02:51 +1200
changeset 105145 7dab8a726f441a8ea59ffb6d2cb0e7e97f120135
parent 105144 74733ab50e1cf93b57f3ffbd85db2766767705a9
child 105146 d7568555261ce6c7166c880f35bd64d5ba99a94b
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersehsan
bugs780260
milestone17.0a1
Bug 780260 - Remove PRInt32 types added by the previous changeset. r=ehsan
gfx/layers/ImageContainer.cpp
gfx/layers/ImageContainer.h
gfx/layers/basic/BasicImageLayer.cpp
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -34,17 +34,17 @@ using namespace mozilla::ipc;
 using namespace android;
 using mozilla::gfx::DataSourceSurface;
 using mozilla::gfx::SourceSurface;
 
 
 namespace mozilla {
 namespace layers {
 
-PRInt32 Image::sSerialCounter = 0;
+int32_t Image::sSerialCounter = 0;
 
 already_AddRefed<Image>
 ImageFactory::CreateImage(const ImageFormat *aFormats,
                           uint32_t aNumFormats,
                           const gfxIntSize &,
                           BufferRecycleBin *aRecycleBin)
 {
   if (!aNumFormats) {
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -75,31 +75,31 @@ public:
   virtual already_AddRefed<gfxASurface> GetAsSurface() = 0;
   virtual gfxIntSize GetSize() = 0;
 
   ImageBackendData* GetBackendData(LayersBackend aBackend)
   { return mBackendData[aBackend]; }
   void SetBackendData(LayersBackend aBackend, ImageBackendData* aData)
   { mBackendData[aBackend] = aData; }
 
-  PRInt32 GetSerial() { return mSerial; }
+  int32_t GetSerial() { return mSerial; }
 
 protected:
   Image(void* aImplData, ImageFormat aFormat) :
     mImplData(aImplData),
     mSerial(PR_ATOMIC_INCREMENT(&sSerialCounter)),
     mFormat(aFormat)
   {}
 
   nsAutoPtr<ImageBackendData> mBackendData[mozilla::layers::LAYERS_LAST];
 
   void* mImplData;
-  PRInt32 mSerial;
+  int32_t mSerial;
   ImageFormat mFormat;
-  static PRInt32 sSerialCounter;
+  static int32_t sSerialCounter;
 };
 
 /**
  * A RecycleBin is owned by an ImageContainer. We store buffers in it that we
  * want to recycle from one image to the next.It's a separate object from 
  * ImageContainer because images need to store a strong ref to their RecycleBin
  * and we must avoid creating a reference loop between an ImageContainer and
  * its active image.
--- a/gfx/layers/basic/BasicImageLayer.cpp
+++ b/gfx/layers/basic/BasicImageLayer.cpp
@@ -242,17 +242,17 @@ private:
   // For YUV Images these are the 3 planes (Y, Cb and Cr),
   // for RGB images only mBackSurface is used.
   SurfaceDescriptor mBackBuffer;
   bool mBufferIsOpaque;
   SurfaceDescriptor mBackBufferY;
   SurfaceDescriptor mBackBufferU;
   SurfaceDescriptor mBackBufferV;
   gfxIntSize mCbCrSize;
-  PRInt32 mLastPaintedImageSerial;
+  int32_t mLastPaintedImageSerial;
 };
  
 void
 BasicShadowableImageLayer::Paint(gfxContext* aContext, Layer* aMaskLayer)
 {
   if (!HasShadow()) {
     BasicImageLayer::Paint(aContext, aMaskLayer);
     return;