| 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 <utility> |
| 8 |
| 7 #include "android_webview/browser/browser_view_renderer.h" | 9 #include "android_webview/browser/browser_view_renderer.h" |
| 8 #include "android_webview/browser/child_frame.h" | 10 #include "android_webview/browser/child_frame.h" |
| 9 #include "android_webview/browser/deferred_gpu_command_service.h" | 11 #include "android_webview/browser/deferred_gpu_command_service.h" |
| 10 #include "android_webview/browser/hardware_renderer.h" | 12 #include "android_webview/browser/hardware_renderer.h" |
| 11 #include "android_webview/browser/scoped_app_gl_state_restore.h" | 13 #include "android_webview/browser/scoped_app_gl_state_restore.h" |
| 12 #include "android_webview/public/browser/draw_gl.h" | 14 #include "android_webview/public/browser/draw_gl.h" |
| 13 #include "base/bind.h" | 15 #include "base/bind.h" |
| 14 #include "base/lazy_instance.h" | 16 #include "base/lazy_instance.h" |
| 15 #include "base/location.h" | 17 #include "base/location.h" |
| 16 #include "base/time/time.h" | 18 #include "base/time/time.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 } | 161 } |
| 160 | 162 |
| 161 gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() { | 163 gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() { |
| 162 base::AutoLock lock(lock_); | 164 base::AutoLock lock(lock_); |
| 163 return scroll_offset_; | 165 return scroll_offset_; |
| 164 } | 166 } |
| 165 | 167 |
| 166 void SharedRendererState::SetCompositorFrameOnUI(scoped_ptr<ChildFrame> frame) { | 168 void SharedRendererState::SetCompositorFrameOnUI(scoped_ptr<ChildFrame> frame) { |
| 167 base::AutoLock lock(lock_); | 169 base::AutoLock lock(lock_); |
| 168 DCHECK(!child_frame_.get()); | 170 DCHECK(!child_frame_.get()); |
| 169 child_frame_ = frame.Pass(); | 171 child_frame_ = std::move(frame); |
| 170 } | 172 } |
| 171 | 173 |
| 172 scoped_ptr<ChildFrame> SharedRendererState::PassCompositorFrameOnRT() { | 174 scoped_ptr<ChildFrame> SharedRendererState::PassCompositorFrameOnRT() { |
| 173 base::AutoLock lock(lock_); | 175 base::AutoLock lock(lock_); |
| 174 hardware_renderer_has_frame_ = | 176 hardware_renderer_has_frame_ = |
| 175 hardware_renderer_has_frame_ || child_frame_.get(); | 177 hardware_renderer_has_frame_ || child_frame_.get(); |
| 176 return child_frame_.Pass(); | 178 return std::move(child_frame_); |
| 177 } | 179 } |
| 178 | 180 |
| 179 scoped_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() { | 181 scoped_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() { |
| 180 base::AutoLock lock(lock_); | 182 base::AutoLock lock(lock_); |
| 181 return child_frame_.Pass(); | 183 return std::move(child_frame_); |
| 182 } | 184 } |
| 183 | 185 |
| 184 void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT( | 186 void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT( |
| 185 const ParentCompositorDrawConstraints& parent_draw_constraints) { | 187 const ParentCompositorDrawConstraints& parent_draw_constraints) { |
| 186 { | 188 { |
| 187 base::AutoLock lock(lock_); | 189 base::AutoLock lock(lock_); |
| 188 parent_draw_constraints_ = parent_draw_constraints; | 190 parent_draw_constraints_ = parent_draw_constraints; |
| 189 } | 191 } |
| 190 | 192 |
| 191 // No need to hold the lock_ during the post task. | 193 // No need to hold the lock_ during the post task. |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 : shared_renderer_state_(shared_renderer_state) { | 371 : shared_renderer_state_(shared_renderer_state) { |
| 370 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); | 372 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); |
| 371 shared_renderer_state_->SetInsideHardwareRelease(true); | 373 shared_renderer_state_->SetInsideHardwareRelease(true); |
| 372 } | 374 } |
| 373 | 375 |
| 374 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { | 376 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { |
| 375 shared_renderer_state_->SetInsideHardwareRelease(false); | 377 shared_renderer_state_->SetInsideHardwareRelease(false); |
| 376 } | 378 } |
| 377 | 379 |
| 378 } // namespace android_webview | 380 } // namespace android_webview |
| OLD | NEW |