Cleanups to well-behaved accelerated plugin CL requested by...

chrome/browser/renderer_host/accelerated_surface_container_mac.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/accelerated_surface_container_mac.h"
 
 #include "app/surface/io_surface_support_mac.h"
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "webkit/glue/plugins/webplugin.h"
 
 AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac(
     AcceleratedSurfaceContainerManagerMac* manager,
     bool opaque)
     : manager_(manager),
       opaque_(opaque),
       surface_(NULL),
       width_(0),
       height_(0),
       texture_(0),
-      texture_needs_upload_(true) {
+      texture_needs_upload_(true),
+      texture_pending_deletion_(0) {
 }
 
 AcceleratedSurfaceContainerMac::~AcceleratedSurfaceContainerMac() {
-  EnqueueTextureForDeletion();
   ReleaseIOSurface();
 }
 
 void AcceleratedSurfaceContainerMac::ReleaseIOSurface() {
   if (surface_) {
     CFRelease(surface_);
     surface_ = NULL;
   }
 }
 
@@ skipping 17 matching lines @@
     int32 height,
     TransportDIB::Handle transport_dib) {
   if (TransportDIB::is_valid(transport_dib)) {
     transport_dib_.reset(TransportDIB::Map(transport_dib));
     EnqueueTextureForDeletion();
     width_ = width;
     height_ = height;
   }
 }
 
-void AcceleratedSurfaceContainerMac::MoveTo(
+void AcceleratedSurfaceContainerMac::SetGeometry(
     const webkit_glue::WebPluginGeometry& geom) {
   // TODO(kbr): may need to pay attention to cutout rects.
   if (geom.visible)
     clipRect_ = geom.clip_rect;
   else
     clipRect_ = gfx::Rect();
 }
 
 void AcceleratedSurfaceContainerMac::Draw(CGLContextObj context) {
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
+  if (texture_pending_deletion_) {
+    // Clean up an old texture object. This is essentially a pre-emptive
+    // cleanup, as the resources will be released when the OpenGL context
+    // associated with our containing NSView is destroyed. However, if we
+    // resize a plugin often, we might generate a lot of textures, so we
+    // should try to eagerly reclaim their resources. Note also that the
+    // OpenGL context must be current when performing the deletion, and it
+    // seems risky to make the OpenGL context current at an arbitrary point
+    // in time, which is why the deletion does not occur in the container's
+    // destructor.
+    glDeleteTextures(1, &texture_pending_deletion_);
+    texture_pending_deletion_ = 0;
+  }
   if (!texture_) {
     if ((io_surface_support && !surface_) ||
         (!io_surface_support && !transport_dib_.get()))
       return;
     glGenTextures(1, &texture_);
     glBindTexture(target, texture_);
     glTexParameterf(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameterf(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     if (io_surface_support) {
       texture_needs_upload_ = true;
@@ skipping 99 matching lines @@
       glTexCoord2f(clipX + clipWidth, height_ - clipY - clipHeight);
       glVertex3f(clipWidth, clipHeight, 0);
 
     glEnd();
     glDisable(target);
   }
 }
 
 void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion() {
   if (texture_) {
-    manager_->EnqueueTextureForDeletion(texture_);
+    DCHECK(texture_pending_deletion_ == 0);
+    texture_pending_deletion_ = texture_;
     texture_ = 0;
   }
 }