Chromium Code Reviews| Index: content/browser/gpu/gpu_surface_tracker.cc |
| diff --git a/content/browser/gpu/gpu_surface_tracker.cc b/content/browser/gpu/gpu_surface_tracker.cc |
| index 59992d5ce5fbf567ce1855727d119c69bedf7ecb..1ed68ae12b1869d0f9ee2a12f46acaa9a58919c4 100644 |
| --- a/content/browser/gpu/gpu_surface_tracker.cc |
| +++ b/content/browser/gpu/gpu_surface_tracker.cc |
| @@ -6,6 +6,10 @@ |
| #include "base/logging.h" |
| +#if defined(OS_ANDROID) |
| +#include <android/native_window_jni.h> |
| +#endif // defined(OS_ANDROID) |
|
no sievers
2013/01/28 23:05:03
I *think* this might belong above including loggin
boliu
2013/01/28 23:42:13
Done.
|
| + |
| namespace content { |
| GpuSurfaceTracker::GpuSurfaceTracker() |
| @@ -104,6 +108,12 @@ gfx::AcceleratedWidget GpuSurfaceTracker::GetNativeWidget(int surface_id) { |
| SurfaceMap::iterator it = surface_map_.find(surface_id); |
| if (it == surface_map_.end()) |
| return gfx::kNullAcceleratedWidget; |
| + |
| +#if defined(OS_ANDROID) |
| + if (it->second.native_widget != gfx::kNullAcceleratedWidget) |
| + ANativeWindow_acquire(it->second.native_widget); |
| +#endif // defined(OS_ANDROID) |
| + |
| return it->second.native_widget; |
| } |