| Index: android_webview/browser/shared_renderer_state.cc
|
| diff --git a/android_webview/browser/shared_renderer_state.cc b/android_webview/browser/shared_renderer_state.cc
|
| index 309d23323dfc212bb5d5d58fc02da172f21f4911..56c55a13fb72e7fdc9716cbf5425bbdca0d732f2 100644
|
| --- a/android_webview/browser/shared_renderer_state.cc
|
| +++ b/android_webview/browser/shared_renderer_state.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "android_webview/browser/shared_renderer_state.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| #include "android_webview/browser/child_frame.h"
|
| #include "android_webview/browser/deferred_gpu_command_service.h"
|
| @@ -166,19 +168,19 @@ gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() {
|
| void SharedRendererState::SetCompositorFrameOnUI(scoped_ptr<ChildFrame> frame) {
|
| base::AutoLock lock(lock_);
|
| DCHECK(!child_frame_.get());
|
| - child_frame_ = frame.Pass();
|
| + child_frame_ = std::move(frame);
|
| }
|
|
|
| scoped_ptr<ChildFrame> SharedRendererState::PassCompositorFrameOnRT() {
|
| base::AutoLock lock(lock_);
|
| hardware_renderer_has_frame_ =
|
| hardware_renderer_has_frame_ || child_frame_.get();
|
| - return child_frame_.Pass();
|
| + return std::move(child_frame_);
|
| }
|
|
|
| scoped_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() {
|
| base::AutoLock lock(lock_);
|
| - return child_frame_.Pass();
|
| + return std::move(child_frame_);
|
| }
|
|
|
| void SharedRendererState::PostExternalDrawConstraintsToChildCompositorOnRT(
|
|
|