From 74d5b65fae72d39058eca6719df0bc73e837bb03 Mon Sep 17 00:00:00 2001 From: Tor Arvid Lund Date: Fri, 20 Dec 2013 11:46:30 -0500 Subject: [PATCH] Bug 950677 - gfxIntSize -> IntSize in ThebesLayer* classes. r=nical --- gfx/layers/d3d10/ThebesLayerD3D10.cpp | 6 +++--- gfx/layers/d3d10/ThebesLayerD3D10.h | 2 +- gfx/layers/d3d9/ThebesLayerD3D9.cpp | 8 ++++---- gfx/layers/d3d9/ThebesLayerD3D9.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gfx/layers/d3d10/ThebesLayerD3D10.cpp b/gfx/layers/d3d10/ThebesLayerD3D10.cpp index 98e0961a9073..8f1fb09b1327 100644 --- a/gfx/layers/d3d10/ThebesLayerD3D10.cpp +++ b/gfx/layers/d3d10/ThebesLayerD3D10.cpp @@ -200,7 +200,7 @@ ThebesLayerD3D10::Validate(ReadbackProcessor *aReadback) // No point in retaining parts which were not valid. retainRegion.And(retainRegion, mValidRegion); - CreateNewTextures(gfxIntSize(newTextureRect.width, newTextureRect.height), mode); + CreateNewTextures(gfx::IntSize(newTextureRect.width, newTextureRect.height), mode); nsIntRect largeRect = retainRegion.GetLargestRectangle(); @@ -227,7 +227,7 @@ ThebesLayerD3D10::Validate(ReadbackProcessor *aReadback) mTextureRect = newTextureRect; if (!mTexture || (mode == SURFACE_COMPONENT_ALPHA && !mTextureOnWhite)) { - CreateNewTextures(gfxIntSize(newTextureRect.width, newTextureRect.height), mode); + CreateNewTextures(gfx::IntSize(newTextureRect.width, newTextureRect.height), mode); mValidRegion.SetEmpty(); } @@ -433,7 +433,7 @@ ThebesLayerD3D10::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode) } void -ThebesLayerD3D10::CreateNewTextures(const gfxIntSize &aSize, SurfaceMode aMode) +ThebesLayerD3D10::CreateNewTextures(const gfx::IntSize &aSize, SurfaceMode aMode) { if (aSize.width == 0 || aSize.height == 0) { // Nothing to do. diff --git a/gfx/layers/d3d10/ThebesLayerD3D10.h b/gfx/layers/d3d10/ThebesLayerD3D10.h index 71d7e394d36f..d0f7079837fe 100644 --- a/gfx/layers/d3d10/ThebesLayerD3D10.h +++ b/gfx/layers/d3d10/ThebesLayerD3D10.h @@ -63,7 +63,7 @@ private: void DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode); /* Create a new texture */ - void CreateNewTextures(const gfxIntSize &aSize, SurfaceMode aMode); + void CreateNewTextures(const gfx::IntSize &aSize, SurfaceMode aMode); // Fill textures with opaque black and white in the specified region. void FillTexturesBlackWhite(const nsIntRegion& aRegion, const nsIntPoint& aOffset); diff --git a/gfx/layers/d3d9/ThebesLayerD3D9.cpp b/gfx/layers/d3d9/ThebesLayerD3D9.cpp index 6dbc6752cac4..a2d398abdcf2 100644 --- a/gfx/layers/d3d9/ThebesLayerD3D9.cpp +++ b/gfx/layers/d3d9/ThebesLayerD3D9.cpp @@ -120,7 +120,7 @@ ThebesLayerD3D9::UpdateTextures(SurfaceMode aMode) // the new visible region retainRegion.And(mValidRegion, mVisibleRegion); - CreateNewTextures(gfxIntSize(visibleRect.width, visibleRect.height), aMode); + CreateNewTextures(gfx::IntSize(visibleRect.width, visibleRect.height), aMode); // If our texture creation failed this can mean a device reset is pending and we // should silently ignore the failure. In the future when device failures @@ -140,7 +140,7 @@ ThebesLayerD3D9::UpdateTextures(SurfaceMode aMode) mTextureRect = visibleRect; } } else { - CreateNewTextures(gfxIntSize(visibleRect.width, visibleRect.height), aMode); + CreateNewTextures(gfx::IntSize(visibleRect.width, visibleRect.height), aMode); mTextureRect = visibleRect; NS_ASSERTION(mValidRegion.IsEmpty(), "Someone forgot to empty the region"); @@ -598,8 +598,8 @@ ThebesLayerD3D9::DrawRegion(nsIntRegion &aRegion, SurfaceMode aMode, } void -ThebesLayerD3D9::CreateNewTextures(const gfxIntSize &aSize, - SurfaceMode aMode) +ThebesLayerD3D9::CreateNewTextures(const gfx::IntSize &aSize, + SurfaceMode aMode) { if (aSize.width == 0 || aSize.height == 0) { // Nothing to do. diff --git a/gfx/layers/d3d9/ThebesLayerD3D9.h b/gfx/layers/d3d9/ThebesLayerD3D9.h index a0b350ac1164..0abada704286 100644 --- a/gfx/layers/d3d9/ThebesLayerD3D9.h +++ b/gfx/layers/d3d9/ThebesLayerD3D9.h @@ -73,7 +73,7 @@ private: const nsTArray& aReadbackUpdates); /* Create a new texture */ - void CreateNewTextures(const gfxIntSize &aSize, SurfaceMode aMode); + void CreateNewTextures(const gfx::IntSize &aSize, SurfaceMode aMode); void CopyRegion(IDirect3DTexture9* aSrc, const nsIntPoint &aSrcOffset, IDirect3DTexture9* aDest, const nsIntPoint &aDestOffset,