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

Side by Side Diff: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
6 #define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #include <OpenGL/OpenGL.h> 9 #include <OpenGL/OpenGL.h>
10 #include <map> 10 #include <map>
11 11
12 #include "app/surface/transport_dib.h" 12 #include "app/surface/transport_dib.h"
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "gfx/native_widget_types.h" 15 #include "gfx/native_widget_types.h"
16 16
17 namespace webkit { 17 namespace webkit {
18 namespace npapi { 18 namespace npapi {
19 struct WebPluginGeometry; 19 struct WebPluginGeometry;
20 } 20 }
21 } 21 }
22 22
23 class AcceleratedSurfaceContainerMac; 23 class AcceleratedSurfaceContainerMac;
24 24
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 gfx::PluginWindowHandle root_container_handle_; 109 gfx::PluginWindowHandle root_container_handle_;
110 110
111 // True if gpu rendering is active. The root container is created on demand 111 // True if gpu rendering is active. The root container is created on demand
112 // and destroyed only when a renderer process exits. When the compositor was 112 // and destroyed only when a renderer process exits. When the compositor was
113 // created, this is set to |false| while the compositor is not needed. 113 // created, this is set to |false| while the compositor is not needed.
114 bool gpu_rendering_active_; 114 bool gpu_rendering_active_;
115 115
116 // Both |plugin_window_to_container_map_| and the 116 // Both |plugin_window_to_container_map_| and the
117 // AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from 117 // AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from
118 // multiple threads. All these accesses are guarded by this lock. 118 // multiple threads. All these accesses are guarded by this lock.
119 mutable Lock lock_; 119 mutable base::Lock lock_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac); 121 DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac);
122 }; 122 };
123 123
124 #endif // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_ 124 #endif // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
125 125
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698