Bug 680082 - [backout] Add GetMaxTextureImageSize to correct size support for TiledTextureImage.

gfx/layers/opengl/ThebesLayerOGL.cpp

@@ -506,8 +506,8 @@ BasicBufferOGL::BeginPaint(ContentType aContentType,
   if (result.mRegionToDraw.IsEmpty())
     return result;
 
-  if (destBufferRect.width > gl()->GetMaxTextureImageSize() ||
-      destBufferRect.height > gl()->GetMaxTextureImageSize()) {
+  if (destBufferRect.width > gl()->GetMaxTextureSize() ||
+      destBufferRect.height > gl()->GetMaxTextureSize()) {
     return result;
   }
 

gfx/thebes/GLContext.cpp

@@ -419,7 +419,6 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
 
         fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
         fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mMaxRenderbufferSize);
-        mMaxTextureImageSize = mMaxTextureSize;
 
         UpdateActualFormat();
     }

gfx/thebes/GLContext.h

@@ -1258,7 +1258,6 @@ public:
                                    const char *extension);
 
     GLint GetMaxTextureSize() { return mMaxTextureSize; }
-    GLint GetMaxTextureImageSize() { return mMaxTextureImageSize; }
     void SetFlipped(bool aFlipped) { mFlipped = aFlipped; }
 
     // this should just be a std::bitset, but that ended up breaking
@@ -1398,7 +1397,6 @@ protected:
     nsTArray<nsIntRect> mScissorStack;
 
     GLint mMaxTextureSize;
-    GLint mMaxTextureImageSize;
     GLint mMaxRenderbufferSize;
 
 public:

gfx/thebes/GLContextProviderEGL.cpp

@@ -726,9 +726,6 @@ public:
         }
 
         bool ok = InitWithPrefix("gl", true);
-
-        PR_STATIC_ASSERT(sizeof(GLint) >= sizeof(int32_t));
-        mMaxTextureImageSize = INT32_MAX;
 #if 0
         if (ok) {
             EGLint v;