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

chrome/browser/renderer_host/accelerated_surface_container_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
 #pragma once
 
 // The "GPU plugin" is currently implemented as a special kind of
 // NPAPI plugin to provide high-performance on-screen 3D rendering for
@@ skipping 41 matching lines @@
   // There are two versions: the IOSurface version is used on systems where the
   // IOSurface API is supported (Mac OS X 10.6 and later); the TransportDIB is
   // used on Mac OS X 10.5 and earlier.
   void SetSizeAndIOSurface(int32 width,
                            int32 height,
                            uint64 io_surface_identifier);
   void SetSizeAndTransportDIB(int32 width,
                               int32 height,
                               TransportDIB::Handle transport_dib);
 
-  // Tells the accelerated surface container that it has moved relative to the
-  // origin of the window, for example because of a scroll event.
-  void MoveTo(const webkit_glue::WebPluginGeometry& geom);
+  // Tells the accelerated surface container that its geometry has changed,
+  // for example because of a scroll event. (Note that the container
+  // currently only pays attention to the clip width and height, since the
+  // view in which it is hosted is responsible for positioning it on the
+  // page.)
+  void SetGeometry(const webkit_glue::WebPluginGeometry& geom);
 
   // Draws this accelerated surface's contents, texture mapped onto a quad in
   // the given OpenGL context. TODO(kbr): figure out and define exactly how the
   // coordinate system will work out.
   void Draw(CGLContextObj context);
 
   // Causes the next Draw call to trigger a texture upload. Should be called any
   // time the drawing context has changed.
   void ForceTextureReload() { texture_needs_upload_ = true; }
 
@@ skipping 25 matching lines @@
   // The "live" OpenGL texture referring to this IOSurfaceRef. Note
   // that per the CGLTexImageIOSurface2D API we do not need to
   // explicitly update this texture's contents once created. All we
   // need to do is ensure it is re-bound before attempting to draw
   // with it.
   GLuint texture_;
 
   // True if we need to upload the texture again during the next draw.
   bool texture_needs_upload_;
 
+  // This may refer to an old version of the texture if the container is
+  // resized, for example.
+  GLuint texture_pending_deletion_;
+
   // Releases the IOSurface reference, if any, retained by this object.
   void ReleaseIOSurface();
 
   // Enqueue our texture for later deletion.
   void EnqueueTextureForDeletion();
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_