Bug 609637 - Don't swapBuffers with NULL EndTransaction call r=jones.chris.g a=b-f
authorOleg Romashin <romaxa@gmail.com>
Sat, 06 Nov 2010 10:42:56 +0200
changeset 56993 72abdd9035ec284ce6416c146c58d9e3902b388a
parent 56992 d139327473b3c49a05d46aac568be0b08aa212f8
child 56994 aeba37b12aed0a5e8f39b877efdb6a8cdacea605
push id16751
push userromaxa@gmail.com
push dateSat, 06 Nov 2010 08:45:01 +0000
treeherdermozilla-central@72abdd9035ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjones, b-f
bugs609637
milestone2.0b8pre
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 609637 - Don't swapBuffers with NULL EndTransaction call r=jones.chris.g a=b-f
gfx/layers/opengl/LayerManagerOGL.cpp
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -402,17 +402,20 @@ LayerManagerOGL::EndTransaction(DrawTheb
   if (mDestroyed) {
     NS_WARNING("Call on destroyed layer manager");
     return;
   }
 
   mThebesLayerCallback = aCallback;
   mThebesLayerCallbackData = aCallbackData;
 
-  Render();
+  // NULL callback means "non-painting transaction"
+  if (aCallback) {
+    Render();
+  }
 
   mThebesLayerCallback = nsnull;
   mThebesLayerCallbackData = nsnull;
 
   mTarget = NULL;
 
 #ifdef MOZ_LAYERS_HAVE_LOG
   Log();