Fixes layer compositing with AA on Mac
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 19 Oct 2011 15:09:57 -0400
changeset 79601 6cef5f8378a4b720d5cd301b5d7250b3dc13bf09
parent 79600 e393f548f8cbf2a9c0c21886a2294774230382a1
child 79602 c4d1bdcb0c3fd17d39d7c348cf52e17356639a26
push id506
push userclegnitto@mozilla.com
push dateWed, 09 Nov 2011 02:03:18 +0000
treeherdermozilla-aurora@63587fc7bb93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone10.0a1
Fixes layer compositing with AA on Mac
gfx/layers/opengl/CanvasLayerOGL.cpp
--- a/gfx/layers/opengl/CanvasLayerOGL.cpp
+++ b/gfx/layers/opengl/CanvasLayerOGL.cpp
@@ -167,16 +167,20 @@ CanvasLayerOGL::UpdateSurface()
   }
 
 #if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
   if (mPixmap) {
     return;
   }
 #endif
 
+  if (mCanvasGLContext) {
+    mCanvasGLContext->MakeCurrent();
+    mCanvasGLContext->fFinish();
+  }
   mOGLManager->MakeCurrent();
 
   if (mCanvasGLContext &&
       mCanvasGLContext->GetContextType() == gl()->GetContextType())
   {
     if (gl()->BindOffscreenNeedsTexture(mCanvasGLContext) &&
         mTexture == 0)
     {