Mac: Fix concurrent access on a non-threadsafe data structure.

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>
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/cocoa/base_view.h"
 #include "chrome/browser/cocoa/browser_accessibility.h"
 #include "chrome/browser/cocoa/browser_accessibility_delegate.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/edit_command.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webmenuitem.h"
 
+@class AcceleratedPluginView;
 class RenderWidgetHostViewMac;
 class RWHVMEditCommandHelper;
 @class ToolTip;
 
 @protocol RenderWidgetHostViewMacOwner
 - (RenderWidgetHostViewMac*)renderWidgetHostViewMac;
 @end
 
 // This is the view that lives in the Cocoa view hierarchy. In Windows-land,
 // RenderWidgetHostViewWin is both the view and the delegate. We split the roles
@@ skipping 194 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);
   virtual void GpuRenderingStateDidChange();
   void DrawAcceleratedSurfaceInstance(
-      CGLContextObj context, gfx::PluginWindowHandle plugin_handle);
+      CGLContextObj context,
+      gfx::PluginWindowHandle plugin_handle,
+      NSSize size);
   // Forces the textures associated with any accelerated plugin instances
   // to be reloaded.
   void ForceTextureReload();
 
   virtual void SetVisuallyDeemphasized(bool deemphasized);
 
   void KillSelf();
 
   void set_parent_view(NSView* parent_view) { parent_view_ = parent_view; }
 
@@ skipping 26 matching lines @@
   // not having anything to paint (empty backing store from renderer). This
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
   // The time it took after this view was selected for it to be fully painted.
   base::TimeTicks tab_switch_paint_time_;
 
   // Current text input type.
   WebKit::WebTextInputType text_input_type_;
 
-  typedef std::map<gfx::PluginWindowHandle, NSView*> PluginViewMap;
+  typedef std::map<gfx::PluginWindowHandle, AcceleratedPluginView*>
+      PluginViewMap;
   PluginViewMap plugin_views_;  // Weak values.
 
   // Helper class for managing instances of accelerated plug-ins.
   AcceleratedSurfaceContainerManagerMac plugin_container_manager_;
 
  private:
   // Updates the display cursor to the current cursor if the cursor is over this
   // render view.
   void UpdateCursorIfOverSelf();
 
@@ skipping 34 matching lines @@
   // Whether or not web accessibility is enabled.
   bool renderer_accessible_;
 
   // selected text on the renderer.
   std::string selected_text_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_