| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "android_webview/browser/deferred_gpu_command_service.h" | 5 #include "android_webview/browser/deferred_gpu_command_service.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/gl_view_renderer_manager.h" | 7 #include "android_webview/browser/gl_view_renderer_manager.h" |
| 8 #include "android_webview/browser/render_thread_manager.h" | 8 #include "android_webview/browser/render_thread_manager.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 // This method can be called on any thread. | 85 // This method can be called on any thread. |
| 86 // static | 86 // static |
| 87 void DeferredGpuCommandService::RequestProcessGL(bool for_idle) { | 87 void DeferredGpuCommandService::RequestProcessGL(bool for_idle) { |
| 88 RenderThreadManager* renderer_state = | 88 RenderThreadManager* renderer_state = |
| 89 GLViewRendererManager::GetInstance()->GetMostRecentlyDrawn(); | 89 GLViewRendererManager::GetInstance()->GetMostRecentlyDrawn(); |
| 90 if (!renderer_state) { | 90 if (!renderer_state) { |
| 91 LOG(ERROR) << "No hardware renderer. Deadlock likely"; | 91 LOG(ERROR) << "No hardware renderer. Deadlock likely"; |
| 92 return; | 92 return; |
| 93 } | 93 } |
| 94 renderer_state->ClientRequestDrawGL(for_idle); | 94 renderer_state->ClientRequestInvokeGL(for_idle); |
| 95 } | 95 } |
| 96 | 96 |
| 97 // Called from different threads! | 97 // Called from different threads! |
| 98 void DeferredGpuCommandService::ScheduleTask(const base::Closure& task) { | 98 void DeferredGpuCommandService::ScheduleTask(const base::Closure& task) { |
| 99 { | 99 { |
| 100 base::AutoLock lock(tasks_lock_); | 100 base::AutoLock lock(tasks_lock_); |
| 101 tasks_.push(task); | 101 tasks_.push(task); |
| 102 } | 102 } |
| 103 if (ScopedAllowGL::IsAllowed()) { | 103 if (ScopedAllowGL::IsAllowed()) { |
| 104 RunTasks(); | 104 RunTasks(); |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 | 206 |
| 207 void DeferredGpuCommandService::AddRef() const { | 207 void DeferredGpuCommandService::AddRef() const { |
| 208 base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef(); | 208 base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef(); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void DeferredGpuCommandService::Release() const { | 211 void DeferredGpuCommandService::Release() const { |
| 212 base::RefCountedThreadSafe<DeferredGpuCommandService>::Release(); | 212 base::RefCountedThreadSafe<DeferredGpuCommandService>::Release(); |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace android_webview | 215 } // namespace android_webview |
| OLD | NEW |