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

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/plugins/webplugin.h"
 
@@ skipping 47 matching lines @@
 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);
 }
 
-void AcceleratedSurfaceContainerManagerMac::MovePluginContainer(
+void AcceleratedSurfaceContainerManagerMac::SetPluginContainerGeometry(
     const webkit_glue::WebPluginGeometry& move) {
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(move.window);
   if (container)
-    container->MoveTo(move);
+    container->SetGeometry(move);
 }
 
 void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context,
                                                  gfx::PluginWindowHandle id,
                                                  bool draw_root_container) {
-  // 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();
-
   glColorMask(true, true, true, true);
   glClearColor(0, 0, 0, 0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glDisable(GL_DEPTH_TEST);
   glDisable(GL_BLEND);
 
   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 
   AcceleratedSurfaceContainerMac* container = MapIDToContainer(id);
   CHECK(container);
@@ skipping 10 matching lines @@
 
 void AcceleratedSurfaceContainerManagerMac::ForceTextureReload() {
   for (PluginWindowToContainerMap::const_iterator i =
           plugin_window_to_container_map_.begin();
        i != plugin_window_to_container_map_.end(); ++i) {
     AcceleratedSurfaceContainerMac* container = i->second;
     container->ForceTextureReload();
   }
 }
 
-void AcceleratedSurfaceContainerManagerMac::EnqueueTextureForDeletion(
-    GLuint texture) {
-  if (texture) {
-    textures_pending_deletion_.push_back(texture);
-  }
-}
-
 AcceleratedSurfaceContainerMac*
     AcceleratedSurfaceContainerManagerMac::MapIDToContainer(
         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;
 }