Mac: Well-behaved accelerated plugins, preparation

chrome/browser/renderer_host/render_widget_host_view_mac.h

 // Copyright (c) 2006-2008 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_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/CALayer.h>
@@ skipping 115 matching lines @@
   // handling a key down event, not including inserting commands, eg. insertTab,
   // etc.
   EditCommands editCommands_;
 }
 
 @property(assign, nonatomic) NSRect caretRect;
 
 - (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.

 // Set frame, then notify the RenderWidgetHost that the frame has been changed,
 // but do it in a separate task, using |performSelector:withObject:afterDelay:|.
 // This stops the flickering issue in http://crbug.com/31970
 - (void)setFrameWithDeferredUpdate:(NSRect)frame;
 // Notify the RenderWidgetHost that the frame was updated so it can resize
 // its contents.
 - (void)renderWidgetHostWasResized;
 // Cancel ongoing composition (abandon the marked text).
 - (void)cancelComposition;
 // Set the new accessibility tree.
@@ skipping 84 matching lines @@
   virtual void AcceleratedSurfaceSetIOSurface(gfx::PluginWindowHandle window,
                                               int32 width,
                                               int32 height,
                                               uint64 io_surface_identifier);
   virtual void AcceleratedSurfaceSetTransportDIB(
       gfx::PluginWindowHandle window,
       int32 width,
       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);
 
   void KillSelf();
 
   void set_parent_view(NSView* parent_view) { parent_view_ = parent_view; }
 
   void SetTextInputActive(bool active);
 
   // These member variables should be private, but the associated ObjC class
@@ skipping 38 matching lines @@
   void ShutdownHost();
 
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object unless is_popup_menu_ is true.
   // In that case, cocoa_view_ is never inserted into the view hierarchy, so
   // the RenderWidgetHostViewMac will treat it as a strong reference and will
   // release it when told to destroy (for example, because a pop-up menu has
   // 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_;
 
   // Indicates if the page is loading.
   bool is_loading_;
 
   // true if the View is not visible.
   bool is_hidden_;
 
   // True if the widget is a native popup menu.  The renderer code calls this
@@ skipping 12 matching lines @@
   // Helper class for managing instances of accelerated plug-ins.
   AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
 
   // Whether or not web accessibility is enabled.
   bool renderer_accessible_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_