Mac: Well-behaved accelerated plugins, preparation

chrome/browser/renderer_host/render_widget_host_view_mac.h

Index: chrome/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index 86396ffb369dc2b3ec335744da3ef3c09d5ef821..798a07ed3ba4e0cdc73326417aa892e351867982 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -133,9 +133,6 @@ class RWHVMEditCommandHelper;
 - (void)setCanBeKeyView:(BOOL)can;
 - (void)setCloseOnDeactivate:(BOOL)b;
 - (void)setToolTipAtMousePoint:(NSString *)string;
-// Makes sure that the initial layer setup for accelerated plugin drawing has
-// been done. Can be called multiple times.
-- (void)ensureAcceleratedPluginLayer;
 // Triggers a refresh of the accelerated plugin layer; should be called whenever
 // the shared surface for one of the plugins is updated.
 - (void)drawAcceleratedPluginLayer;

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

This method is now completely unused, and needs to be removed.

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

Will delete this and other related code.

@@ -243,10 +240,10 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
       int32 height,
       TransportDIB::Handle transport_dib);
   virtual void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
-  // Draws the current GPU-accelerated plug-in instances into the given context.
-  virtual void DrawAcceleratedSurfaceInstances(CGLContextObj context);
+  void DrawAcceleratedSurfaceInstance(
+      CGLContextObj context, gfx::PluginWindowHandle plugin_handle);
   // Informs the plug-in instances that their drawing context has changed.

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

Comment and function are now mismatched.

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

Will fix.

-  virtual void AcceleratedSurfaceContextChanged();
+  void ForceTextureReload();
 
   virtual void SetVisuallyDeemphasized(bool deemphasized);
 
@@ -305,6 +302,9 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
   // closed).
   RenderWidgetHostViewCocoa* cocoa_view_;
 
+  typedef std::map<gfx::PluginWindowHandle, NSView*> PluginViewMap;
+  PluginViewMap plugin_views_;  // Weak values.
+
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;