| 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/shared_renderer_state.h" | 5 #include "android_webview/browser/shared_renderer_state.h" |
| 6 | 6 |
| 7 #include "android_webview/browser/browser_view_renderer.h" | 7 #include "android_webview/browser/browser_view_renderer.h" |
| 8 #include "android_webview/browser/deferred_gpu_command_service.h" | 8 #include "android_webview/browser/deferred_gpu_command_service.h" |
| 9 #include "android_webview/browser/hardware_renderer.h" | 9 #include "android_webview/browser/hardware_renderer.h" |
| 10 #include "android_webview/browser/scoped_app_gl_state_restore.h" | 10 #include "android_webview/browser/scoped_app_gl_state_restore.h" |
| 11 #include "android_webview/public/browser/draw_gl.h" | 11 #include "android_webview/public/browser/draw_gl.h" |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/debug/trace_event_argument.h" |
| 13 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
| 14 #include "base/location.h" | 15 #include "base/location.h" |
| 15 | 16 |
| 16 namespace android_webview { | 17 namespace android_webview { |
| 17 | 18 |
| 18 namespace internal { | 19 namespace internal { |
| 19 | 20 |
| 20 class RequestDrawGLTracker { | 21 class RequestDrawGLTracker { |
| 21 public: | 22 public: |
| 22 RequestDrawGLTracker(); | 23 RequestDrawGLTracker(); |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 base::AutoLock lock(lock_); | 251 base::AutoLock lock(lock_); |
| 251 resources->swap(returned_resources_); | 252 resources->swap(returned_resources_); |
| 252 } | 253 } |
| 253 | 254 |
| 254 bool SharedRendererState::ReturnedResourcesEmptyOnUI() const { | 255 bool SharedRendererState::ReturnedResourcesEmptyOnUI() const { |
| 255 base::AutoLock lock(lock_); | 256 base::AutoLock lock(lock_); |
| 256 return returned_resources_.empty(); | 257 return returned_resources_.empty(); |
| 257 } | 258 } |
| 258 | 259 |
| 259 void SharedRendererState::DrawGL(AwDrawGLInfo* draw_info) { | 260 void SharedRendererState::DrawGL(AwDrawGLInfo* draw_info) { |
| 261 TRACE_EVENT0("android_webview", "DrawFunctor"); |
| 260 if (draw_info->mode == AwDrawGLInfo::kModeSync) { | 262 if (draw_info->mode == AwDrawGLInfo::kModeSync) { |
| 263 TRACE_EVENT_INSTANT0("android_webview", "kModeSync", |
| 264 TRACE_EVENT_SCOPE_THREAD); |
| 261 if (hardware_renderer_) | 265 if (hardware_renderer_) |
| 262 hardware_renderer_->CommitFrame(); | 266 hardware_renderer_->CommitFrame(); |
| 263 return; | 267 return; |
| 264 } | 268 } |
| 265 | 269 |
| 266 { | 270 { |
| 267 GLViewRendererManager* manager = GLViewRendererManager::GetInstance(); | 271 GLViewRendererManager* manager = GLViewRendererManager::GetInstance(); |
| 268 base::AutoLock lock(lock_); | 272 base::AutoLock lock(lock_); |
| 269 if (renderer_manager_key_ != manager->NullKey()) { | 273 if (renderer_manager_key_ != manager->NullKey()) { |
| 270 manager->DidDrawGL(renderer_manager_key_); | 274 manager->DidDrawGL(renderer_manager_key_); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 : shared_renderer_state_(shared_renderer_state) { | 371 : shared_renderer_state_(shared_renderer_state) { |
| 368 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); | 372 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); |
| 369 shared_renderer_state_->SetInsideHardwareRelease(true); | 373 shared_renderer_state_->SetInsideHardwareRelease(true); |
| 370 } | 374 } |
| 371 | 375 |
| 372 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { | 376 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { |
| 373 shared_renderer_state_->SetInsideHardwareRelease(false); | 377 shared_renderer_state_->SetInsideHardwareRelease(false); |
| 374 } | 378 } |
| 375 | 379 |
| 376 } // namespace android_webview | 380 } // namespace android_webview |
| OLD | NEW |