Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7048)

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_mac.h

Issue 3431011: Mac: Fix concurrent access on a non-threadsafe data structure. (Closed)
Patch Set: '' Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4392b138eff82e5181f982d3ed40410424c300a9..1c3444917f0e055a00b81d84803eb69518c047b7 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -23,6 +23,7 @@
#include "webkit/glue/webcursor.h"
#include "webkit/glue/webmenuitem.h"
+@class AcceleratedPluginView;
class RenderWidgetHostViewMac;
class RWHVMEditCommandHelper;
@class ToolTip;
@@ -237,7 +238,9 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
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();
@@ -284,7 +287,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
// 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.
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698