summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_surface_tracker.cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-09 21:10:33 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-09 21:10:33 +0000
commit82c40477604845df63544e8a2ac4294ba80b82eb (patch)
tree98073cf3899d3d72b3c29c3f75fb2a0ae4e643bd /content/browser/gpu/gpu_surface_tracker.cc
parent90b9fa6a89e97af9322d155d78d30b19a083706c (diff)
downloadchromium_src-82c40477604845df63544e8a2ac4294ba80b82eb.zip
chromium_src-82c40477604845df63544e8a2ac4294ba80b82eb.tar.gz
chromium_src-82c40477604845df63544e8a2ac4294ba80b82eb.tar.bz2
Add native widgets to GpuSurfaceTracker
BUG=99516 TEST=none Review URL: http://codereview.chromium.org/9373017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_surface_tracker.cc')
-rw-r--r--content/browser/gpu/gpu_surface_tracker.cc15
1 files changed, 14 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_surface_tracker.cc b/content/browser/gpu/gpu_surface_tracker.cc
index 8307a7c..ba15dab 100644
--- a/content/browser/gpu/gpu_surface_tracker.cc
+++ b/content/browser/gpu/gpu_surface_tracker.cc
@@ -20,7 +20,11 @@ GpuSurfaceTracker* GpuSurfaceTracker::GetInstance() {
int GpuSurfaceTracker::AddSurfaceForRenderer(int renderer_id,
int render_widget_id) {
base::AutoLock lock(lock_);
- SurfaceInfo info = { renderer_id, render_widget_id };
+ SurfaceInfo info = {
+ renderer_id,
+ render_widget_id,
+ gfx::kNullAcceleratedWidget
+ };
int surface_id = next_surface_id_++;
surface_map_[surface_id] = info;
return surface_id;
@@ -40,6 +44,15 @@ int GpuSurfaceTracker::LookupSurfaceForRenderer(int renderer_id,
return 0;
}
+int GpuSurfaceTracker::AddSurfaceForNativeWidget(
+ gfx::AcceleratedWidget widget) {
+ base::AutoLock lock(lock_);
+ SurfaceInfo info = { 0, 0, widget };
+ int surface_id = next_surface_id_++;
+ surface_map_[surface_id] = info;
+ return surface_id;
+}
+
void GpuSurfaceTracker::RemoveSurface(int surface_id) {
base::AutoLock lock(lock_);
DCHECK(surface_map_.find(surface_id) != surface_map_.end());