| 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" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 void RequestDrawGLTracker::ResetPending() { | 63 void RequestDrawGLTracker::ResetPending() { |
| 64 base::AutoLock lock(lock_); | 64 base::AutoLock lock(lock_); |
| 65 pending_non_ui_ = NULL; | 65 pending_non_ui_ = NULL; |
| 66 pending_ui_ = NULL; | 66 pending_ui_ = NULL; |
| 67 } | 67 } |
| 68 | 68 |
| 69 void RequestDrawGLTracker::SetQueuedFunctorOnUi(SharedRendererState* state) { | 69 void RequestDrawGLTracker::SetQueuedFunctorOnUi(SharedRendererState* state) { |
| 70 base::AutoLock lock(lock_); | 70 base::AutoLock lock(lock_); |
| 71 DCHECK(state); | 71 DCHECK(state); |
| 72 DCHECK(pending_ui_ == state || pending_non_ui_ == state); | |
| 73 pending_ui_ = state; | 72 pending_ui_ = state; |
| 74 pending_non_ui_ = NULL; | 73 pending_non_ui_ = NULL; |
| 75 } | 74 } |
| 76 | 75 |
| 77 } // namespace internal | 76 } // namespace internal |
| 78 | 77 |
| 79 namespace { | 78 namespace { |
| 80 | 79 |
| 81 base::LazyInstance<internal::RequestDrawGLTracker> g_request_draw_gl_tracker = | 80 base::LazyInstance<internal::RequestDrawGLTracker> g_request_draw_gl_tracker = |
| 82 LAZY_INSTANCE_INITIALIZER; | 81 LAZY_INSTANCE_INITIALIZER; |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 : shared_renderer_state_(shared_renderer_state) { | 382 : shared_renderer_state_(shared_renderer_state) { |
| 384 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); | 383 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); |
| 385 shared_renderer_state_->SetInsideHardwareRelease(true); | 384 shared_renderer_state_->SetInsideHardwareRelease(true); |
| 386 } | 385 } |
| 387 | 386 |
| 388 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { | 387 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { |
| 389 shared_renderer_state_->SetInsideHardwareRelease(false); | 388 shared_renderer_state_->SetInsideHardwareRelease(false); |
| 390 } | 389 } |
| 391 | 390 |
| 392 } // namespace android_webview | 391 } // namespace android_webview |
| OLD | NEW |