| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/gpu/gpu_surface_tracker.h" | 5 #include "content/browser/gpu/gpu_surface_tracker.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
| 11 #include <android/native_window_jni.h> | 11 #include <android/native_window_jni.h> |
| 12 #include "content/browser/android/child_process_launcher_android.h" |
| 13 #include "ui/gl/android/scoped_java_surface.h" |
| 12 #endif // defined(OS_ANDROID) | 14 #endif // defined(OS_ANDROID) |
| 13 | 15 |
| 14 namespace content { | 16 namespace content { |
| 15 | 17 |
| 16 GpuSurfaceTracker::GpuSurfaceTracker() | 18 GpuSurfaceTracker::GpuSurfaceTracker() |
| 17 : next_surface_id_(1) { | 19 : next_surface_id_(1) { |
| 18 gpu::GpuSurfaceLookup::InitInstance(this); | 20 gpu::GpuSurfaceLookup::InitInstance(this); |
| 19 } | 21 } |
| 20 | 22 |
| 21 GpuSurfaceTracker::~GpuSurfaceTracker() { | 23 GpuSurfaceTracker::~GpuSurfaceTracker() { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 return gfx::kNullAcceleratedWidget; | 69 return gfx::kNullAcceleratedWidget; |
| 68 | 70 |
| 69 #if defined(OS_ANDROID) | 71 #if defined(OS_ANDROID) |
| 70 if (it->second != gfx::kNullAcceleratedWidget) | 72 if (it->second != gfx::kNullAcceleratedWidget) |
| 71 ANativeWindow_acquire(it->second); | 73 ANativeWindow_acquire(it->second); |
| 72 #endif // defined(OS_ANDROID) | 74 #endif // defined(OS_ANDROID) |
| 73 | 75 |
| 74 return it->second; | 76 return it->second; |
| 75 } | 77 } |
| 76 | 78 |
| 79 #if defined(OS_ANDROID) |
| 80 gfx::ScopedJavaSurface GpuSurfaceTracker::AcquireJavaSurface(int surface_id) { |
| 81 return GetViewSurface(surface_id); |
| 82 } |
| 83 #endif |
| 84 |
| 77 std::size_t GpuSurfaceTracker::GetSurfaceCount() { | 85 std::size_t GpuSurfaceTracker::GetSurfaceCount() { |
| 78 base::AutoLock lock(lock_); | 86 base::AutoLock lock(lock_); |
| 79 return surface_map_.size(); | 87 return surface_map_.size(); |
| 80 } | 88 } |
| 81 | 89 |
| 82 } // namespace content | 90 } // namespace content |
| OLD | NEW |