Fixed missing code in EnqueueTextureForDeletion....

chrome/browser/renderer_host/accelerated_surface_container_manager_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_manager_mac.h"
 
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_mac.h"
 #include "webkit/glue/webplugin.h"
 
 AcceleratedSurfaceContainerManagerMac::AcceleratedSurfaceContainerManagerMac()
     : current_id_(0) {
 }
 
 gfx::PluginWindowHandle
 AcceleratedSurfaceContainerManagerMac::AllocateFakePluginWindowHandle() {
   AcceleratedSurfaceContainerMac* container =
-      new AcceleratedSurfaceContainerMac();
+      new AcceleratedSurfaceContainerMac(this);
   gfx::PluginWindowHandle res =
       static_cast<gfx::PluginWindowHandle>(++current_id_);
   plugin_window_to_container_map_.insert(std::make_pair(res, container));
   return res;
 }
 
 void AcceleratedSurfaceContainerManagerMac::DestroyFakePluginWindowHandle(
     gfx::PluginWindowHandle id) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
     delete container;
   plugin_window_to_container_map_.erase(id);
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSizeAndIOSurface(
     gfx::PluginWindowHandle id,
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
-    container->SetSizeAndIOSurface(width, height,
-                                      io_surface_identifier, this);
+    container->SetSizeAndIOSurface(width, height, io_surface_identifier);
 }
 
 void AcceleratedSurfaceContainerManagerMac::SetSizeAndTransportDIB(
     gfx::PluginWindowHandle id,
     int32 width,
     int32 height,
     TransportDIB::Handle transport_dib) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   if (container)
-    container->SetSizeAndTransportDIB(width, height,
-                                      transport_dib, this);
+    container->SetSizeAndTransportDIB(width, height, transport_dib);
 }
 
 void AcceleratedSurfaceContainerManagerMac::MovePluginContainer(
     const webkit_glue::WebPluginGeometry& move) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(move.window);
   if (container)
     container->MoveTo(move);
 }
 
 void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context) {
+  // Clean up old texture objects. This is essentially a pre-emptive
+  // cleanup, as the resources will be released when the OpenGL
+  // context associated with the CAOpenGLLayer is destroyed. However,
+  // if we render many plugins in the same layer, 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.
+  for (std::vector<GLuint>::iterator iter =
+           textures_pending_deletion_.begin();
+       iter != textures_pending_deletion_.end();
+       ++iter) {
+    GLuint texture = *iter;
+    glDeleteTextures(1, &texture);
+  }
+  textures_pending_deletion_.clear();
+
   glClearColor(0, 0, 0, 0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
   glTexEnvi(target, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
   for (PluginWindowToContainerMap::const_iterator i =
           plugin_window_to_container_map_.begin();
        i != plugin_window_to_container_map_.end(); ++i) {
     AcceleratedSurfaceContainerMac* container = i->second;
@@ skipping 29 matching lines @@
         gfx::PluginWindowHandle id) {
   PluginWindowToContainerMap::const_iterator i =
       plugin_window_to_container_map_.find(id);
   if (i != plugin_window_to_container_map_.end())
     return i->second;
 
   LOG(ERROR) << "Request for plugin container for unknown window id " << id;
 
   return NULL;
 }