Bug 1021614 - [Moz2Dification] Remove the constructors that use thebes sizes in GLTextureImage.h. r=nical
authorGautam Akiwate <gautam.akiwate@gmail.com>
Wed, 23 Jul 2014 21:13:00 +0200
changeset 196120 1edc14facfae8c3d4b57d6032194b9e46eea6115
parent 196119 dadd5f7982c5a8bd02d7f5098522a87f138e0bf6
child 196121 5f1dc690c1116abf69229d2fbe30d6a9c6fa0787
push id27205
push userkwierso@gmail.com
push dateFri, 25 Jul 2014 22:59:38 +0000
treeherdermozilla-central@e07264876182 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1021614
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1021614 - [Moz2Dification] Remove the constructors that use thebes sizes in GLTextureImage.h. r=nical
gfx/gl/GLTextureImage.cpp
gfx/gl/GLTextureImage.h
--- a/gfx/gl/GLTextureImage.cpp
+++ b/gfx/gl/GLTextureImage.cpp
@@ -60,27 +60,16 @@ TileGenFunc(GLContext* gl,
             return TileGenFuncEGL(gl, aSize, aContentType, aFlags, aImageFormat);
         default:
             return nullptr;
     }
 }
 
 already_AddRefed<TextureImage>
 TextureImage::Create(GLContext* gl,
-                     const nsIntSize& size,
-                     TextureImage::ContentType contentType,
-                     GLenum wrapMode,
-                     TextureImage::Flags flags)
-{
-    return Create(gl, size.ToIntSize(), contentType, wrapMode, flags);
-}
-
-// Moz2D equivalent...
-already_AddRefed<TextureImage>
-TextureImage::Create(GLContext* gl,
                      const gfx::IntSize& size,
                      TextureImage::ContentType contentType,
                      GLenum wrapMode,
                      TextureImage::Flags flags)
 {
     return CreateTextureImage(gl, size, contentType, wrapMode, flags);
 }
 
--- a/gfx/gl/GLTextureImage.h
+++ b/gfx/gl/GLTextureImage.h
@@ -62,23 +62,16 @@ public:
         DisallowBigImage = 0x4
     };
 
     typedef gfxContentType ContentType;
     typedef gfxImageFormat ImageFormat;
 
     static already_AddRefed<TextureImage> Create(
                        GLContext* gl,
-                       const nsIntSize& aSize,
-                       TextureImage::ContentType aContentType,
-                       GLenum aWrapMode,
-                       TextureImage::Flags aFlags = TextureImage::NoFlags);
-    // Moz2D equivalent...
-    static already_AddRefed<TextureImage> Create(
-                       GLContext* gl,
                        const gfx::IntSize& aSize,
                        TextureImage::ContentType aContentType,
                        GLenum aWrapMode,
                        TextureImage::Flags aFlags = TextureImage::NoFlags);
 
     /**
      * Returns a gfxASurface for updating |aRegion| of the client's
      * image if successul, nullptr if not.  |aRegion|'s bounds must fit