Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2566)

Unified Diff: android_webview/browser/shared_renderer_state.cc

Issue 1552723002: Convert Pass()→std::move() in //android_webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
« no previous file with comments | « android_webview/browser/net/aw_url_request_job_factory.cc ('k') | android_webview/browser/test/rendering_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698