Fix handling of Mac accelerated plugin layers across tab switch.

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_
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/CALayer.h>
 
@@ skipping 34 matching lines @@
   NSTrackingRectTag lastToolTipTag_;
   scoped_nsobject<NSString> toolTip_;
 
   // Set to YES if insertText: or insertNewline: get called.
   BOOL textInserted_;
 
   // Keep current key event when keyEvent: gets called. It's used in
   // insertText: and insertNewline: to synthesize the corresponding Char event.
   scoped_nsobject<NSEvent> currentKeyEvent_;
   NSWindow* lastWindow_;  // weak
+
+  // The Core Animation layer, if any, hosting the accelerated plugins' output.
+  scoped_nsobject<CALayer> accelerated_plugin_layer_;
 }
 
 - (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;
 @end
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac
 //
 //  An object representing the "View" of a rendered web page. This object is
 //  responsible for displaying the content of the web page, and integrating with
 //  the Cocoa view system. It is the implementation of the RenderWidgetHostView
 //  that the cross-platform RenderWidgetHost object uses
 //  to display the data.
@@ skipping 62 matching lines @@
                                               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);
+  // Informs the plug-in instances that their drawing context has changed.
+  virtual void AcceleratedSurfaceContextChanged();
+
   virtual void SetVisuallyDeemphasized(bool deemphasized);
 
   void KillSelf();
 
   void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; }
 
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
   // The associated Model.  Can be NULL if Destroy() is called when
@@ skipping 48 matching lines @@
   // To create a Char event in NSTextInput methods, we save the latest state
   // of modifier keys when we receive it.
   int im_modifiers_;
 
   // Represents the cursor position in this view coordinate.
   // The renderer sends the cursor position through an IPC message.
   // We save the latest cursor position here and return it when an input
   // methods needs it.
   NSRect im_caret_rect_;
 
-  // The Core Animation layer, if any, hosting the GPU plugins' output.
-  scoped_nsobject<CALayer> gpu_plugin_layer_;
-
  private:
   // Updates the display cursor to the current cursor if the cursor is over this
   // render view.
   void UpdateCursorIfOverSelf();
 
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
   // The associated view. This is weak and is inserted into the view hierarchy
@@ skipping 26 matching lines @@
   // Used for positioning a popup menu.
   BaseView* parent_view_;
 
   // Helper class for managing instances of accelerated plug-ins.
   AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_