Mac: Well-behaved accelerated plugins, preparation

chrome/browser/renderer_host/accelerated_surface_container_manager_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_MANAGER_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
 #pragma once
 
 #include <OpenGL/OpenGL.h>
 #include <map>
@@ skipping 18 matching lines @@
   // Allocates a new "fake" PluginWindowHandle, which is used as the
   // key for the other operations.
   gfx::PluginWindowHandle AllocateFakePluginWindowHandle(bool opaque,
                                                          bool root);
 
   // Destroys a fake PluginWindowHandle and associated storage.
   void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle id);
 
   // Indicates whether a "root" PluginWindowHandle has been allocated,
   // which means that we are using accelerated compositing and should
   // short-circuit the normal drawing process.

[stuartmorgan, 2010/08/11 16:40:44]

This comment pretty clearly doesn't match the function any more.

[Ken Russell (switch to Gerrit), 2010/08/14 02:12:11]

Will fix.

-  bool HasRootContainer();
+  bool IsRootContainer(gfx::PluginWindowHandle id);
 
   // Sets the size and backing store of the plugin instance.  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(gfx::PluginWindowHandle id,
                            int32 width,
                            int32 height,
                            uint64 io_surface_identifier);
   void SetSizeAndTransportDIB(gfx::PluginWindowHandle id,
                               int32 width,
                               int32 height,
                               TransportDIB::Handle transport_dib);
 
   // Takes an update from WebKit about a plugin's position and size and moves
   // the plugin accordingly.
   void MovePluginContainer(const webkit_glue::WebPluginGeometry& move);
 
   // Draws all of the managed plugin containers into the given OpenGL
   // context, which must already be current.

[stuartmorgan, 2010/08/11 16:40:44]

Again, the comment is now completely wrong.

[Ken Russell (switch to Gerrit), 2010/08/14 02:12:11]

Will fix.

   void Draw(CGLContextObj context,
+            gfx::PluginWindowHandle id,
             bool draw_root_container);
 
   // Causes the next Draw call on each container to trigger a texture upload.
   // Should be called any time the drawing context has changed.
   void ForceTextureReload();
 
   // Called by the container to enqueue its OpenGL texture objects for
   // deletion.
   void EnqueueTextureForDeletion(GLuint texture);
 
@@ skipping 20 matching lines @@
   AcceleratedSurfaceContainerMac* root_container_;
 
   // A list of OpenGL textures waiting to be deleted
   std::vector<GLuint> textures_pending_deletion_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_