Bug 618788 - Not initialized used in CairoImageOGL::SetData r=roc a=approval2.0
authorOleg Romashin <romaxa@gmail.com>
Thu, 13 Jan 2011 15:20:46 +0200
changeset 60436 92e1764dc18047585a467600985bde2ea4d4d5a9
parent 60435 70d10ef482f33bb1b1a5962887b2d88b61a0744c
child 60437 bce092d01eb08fe1045cce29fa1ad91939d92e2e
push id17991
push userromaxa@gmail.com
push dateThu, 13 Jan 2011 13:21:25 +0000
treeherdermozilla-central@b9029c71a63a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc, approval2.0
bugs618788
milestone2.0b10pre
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 618788 - Not initialized used in CairoImageOGL::SetData r=roc a=approval2.0
gfx/layers/opengl/ImageLayerOGL.cpp
--- a/gfx/layers/opengl/ImageLayerOGL.cpp
+++ b/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -676,21 +676,19 @@ CairoImageOGL::SetData(const CairoImage:
   if (!mTexture.IsAllocated())
     return;
 
   mozilla::gl::GLContext *gl = mTexture.GetGLContext();
   gl->MakeCurrent();
 
   GLuint tex = mTexture.GetTextureID();
 
-  if (mSize != aData.mSize) {
-    gl->fActiveTexture(LOCAL_GL_TEXTURE0);
-    InitTexture(gl, tex, LOCAL_GL_RGBA, aData.mSize);
-    mSize = aData.mSize;
-  }
+  gl->fActiveTexture(LOCAL_GL_TEXTURE0);
+  InitTexture(gl, tex, LOCAL_GL_RGBA, aData.mSize);
+  mSize = aData.mSize;
 
   if (!mASurfaceAsGLContext) {
     mASurfaceAsGLContext = GLContextProvider::CreateForNativePixmapSurface(aData.mSurface);
     if (mASurfaceAsGLContext)
       mASurfaceAsGLContext->BindTexImage();
   }
 
   if (mASurfaceAsGLContext)