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> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/browser/child_frame.h" | 9 #include "android_webview/browser/child_frame.h" |
10 #include "android_webview/browser/deferred_gpu_command_service.h" | 10 #include "android_webview/browser/deferred_gpu_command_service.h" |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 void SharedRendererState::SetScrollOffsetOnUI(gfx::Vector2d scroll_offset) { | 158 void SharedRendererState::SetScrollOffsetOnUI(gfx::Vector2d scroll_offset) { |
159 base::AutoLock lock(lock_); | 159 base::AutoLock lock(lock_); |
160 scroll_offset_ = scroll_offset; | 160 scroll_offset_ = scroll_offset; |
161 } | 161 } |
162 | 162 |
163 gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() { | 163 gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() { |
164 base::AutoLock lock(lock_); | 164 base::AutoLock lock(lock_); |
165 return scroll_offset_; | 165 return scroll_offset_; |
166 } | 166 } |
167 | 167 |
168 void SharedRendererState::SetFrameOnUI(scoped_ptr<ChildFrame> frame) { | 168 void SharedRendererState::SetFrameOnUI(std::unique_ptr<ChildFrame> frame) { |
169 base::AutoLock lock(lock_); | 169 base::AutoLock lock(lock_); |
170 DCHECK(!child_frame_.get()); | 170 DCHECK(!child_frame_.get()); |
171 child_frame_ = std::move(frame); | 171 child_frame_ = std::move(frame); |
172 } | 172 } |
173 | 173 |
174 scoped_ptr<ChildFrame> SharedRendererState::PassFrameOnRT() { | 174 std::unique_ptr<ChildFrame> SharedRendererState::PassFrameOnRT() { |
175 base::AutoLock lock(lock_); | 175 base::AutoLock lock(lock_); |
176 hardware_renderer_has_frame_ = | 176 hardware_renderer_has_frame_ = |
177 hardware_renderer_has_frame_ || child_frame_.get(); | 177 hardware_renderer_has_frame_ || child_frame_.get(); |
178 return std::move(child_frame_); | 178 return std::move(child_frame_); |
179 } | 179 } |
180 | 180 |
181 scoped_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() { | 181 std::unique_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() { |
182 base::AutoLock lock(lock_); | 182 base::AutoLock lock(lock_); |
183 return std::move(child_frame_); | 183 return std::move(child_frame_); |
184 } | 184 } |
185 | 185 |
186 void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT( | 186 void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT( |
187 const ParentCompositorDrawConstraints& parent_draw_constraints) { | 187 const ParentCompositorDrawConstraints& parent_draw_constraints) { |
188 { | 188 { |
189 base::AutoLock lock(lock_); | 189 base::AutoLock lock(lock_); |
190 parent_draw_constraints_ = parent_draw_constraints; | 190 parent_draw_constraints_ = parent_draw_constraints; |
191 } | 191 } |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 : shared_renderer_state_(shared_renderer_state) { | 371 : shared_renderer_state_(shared_renderer_state) { |
372 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); | 372 DCHECK(!shared_renderer_state_->IsInsideHardwareRelease()); |
373 shared_renderer_state_->SetInsideHardwareRelease(true); | 373 shared_renderer_state_->SetInsideHardwareRelease(true); |
374 } | 374 } |
375 | 375 |
376 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { | 376 SharedRendererState::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { |
377 shared_renderer_state_->SetInsideHardwareRelease(false); | 377 shared_renderer_state_->SetInsideHardwareRelease(false); |
378 } | 378 } |
379 | 379 |
380 } // namespace android_webview | 380 } // namespace android_webview |
OLD | NEW |