Don't issue any extra geometry for the IOSurface leak workaround

content/browser/renderer_host/compositing_iosurface_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositing_iosurface_mac.h"
 
 #include <OpenGL/OpenGL.h>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 368 matching lines @@
         DrawQuad(filler_quad);
       }
       if (window_size.height() > io_surface_size_.height()) {
         // Draw bottom gutter to the width of the IOSurface.
         filler_quad.set_rect(0.0f, io_surface_size_.height(),
                              io_surface_size_.width(), window_size.height());
         DrawQuad(filler_quad);
       }
     }
 
+    // Workaround for issue 158469. Issue a dummy draw call with texture_ not
+    // bound to blit_rgb_sampler_location_, in order to shake all references
+    // to the IOSurface out of the driver.
+    glBegin(GL_TRIANGLES);
+    glEnd();
+
     glUseProgram(0); CHECK_GL_ERROR();
-
-    // Issue a dummy draw call to flush references to the IOSurface out of
-    // the GL driver.
-    DoWorkaroundForIOSurfaceLeak();
   } else {
     // Should match the clear color of RenderWidgetHostViewMac.
     glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
   }
 
   static bool initialized_workaround = false;
   static bool use_glfinish_workaround = false;
 
   if (!initialized_workaround) {
@@ skipping 119 matching lines @@
   glEnableClientState(GL_TEXTURE_COORD_ARRAY); CHECK_GL_ERROR();
 
   glVertexPointer(2, GL_FLOAT, sizeof(SurfaceVertex), &quad.verts_[0].x_);
   glTexCoordPointer(2, GL_FLOAT, sizeof(SurfaceVertex), &quad.verts_[0].tx_);
   glDrawArrays(GL_QUADS, 0, 4); CHECK_GL_ERROR();
 
   glDisableClientState(GL_VERTEX_ARRAY);
   glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
 
-void CompositingIOSurfaceMac::DoWorkaroundForIOSurfaceLeak() {
-  if (!shader_program_blit_rgb_)
-    return;
-
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glOrtho(0, 1, 0, 1, -1, 1);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
-  // Workaround for issue 158469. Issue a dummy draw call with texture_ not
-  // bound to blit_rgb_sampler_location_, in order to shake all references
-  // to the IOSurface out of the driver.
-  glUseProgram(shader_program_blit_rgb_);
-  glUniform1i(blit_rgb_sampler_location_, 0);
-  glActiveTexture(GL_TEXTURE0 + 0);
-  glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-
-  // Let invisible_quad be a quad that is outside of the viewport.
-  SurfaceQuad invisible_quad;
-  invisible_quad.set_rect(-2.0f, -2.0f, -1.9f, -1.9f);
-  invisible_quad.set_texcoord_rect(0.0f, 0.0f, 1.0f, 1.0f);
-  DrawQuad(invisible_quad);
-  glUseProgram(0);
-
-  CHECK_GL_ERROR();
-}
-
 void CompositingIOSurfaceMac::UnrefIOSurfaceWithContextCurrent() {
   if (texture_) {
     glDeleteTextures(1, &texture_);
     texture_ = 0;
   }
 
   io_surface_.reset();
 
   // Forget the ID, because even if it is still around when we want to use it
   // again, OSX may have reused the same ID for a new tab and we don't want to
@@ skipping 303 matching lines @@
   glDeleteFramebuffersEXT(1, &copy_context_.frame_buffer); CHECK_GL_ERROR();
   glDeleteTextures(1, &copy_context_.frame_buffer_texture); CHECK_GL_ERROR();
   glDeleteBuffers(1, &copy_context_.pixel_buffer); CHECK_GL_ERROR();
   if (copy_context_.use_fence) {
     glDeleteFencesAPPLE(1, &copy_context_.fence); CHECK_GL_ERROR();
   }
   copy_context_.Reset();
 }
 
 }  // namespace content