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

Unified Diff: android_webview/browser/shared_renderer_state.cc

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard Created 4 years, 9 months 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
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | android_webview/browser/test/fake_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 af9da3effa80f90f02faed87ff361da011c16efc..22db5a86041c7da2037547aa1347cbbd19eec160 100644
--- a/android_webview/browser/shared_renderer_state.cc
+++ b/android_webview/browser/shared_renderer_state.cc
@@ -165,20 +165,20 @@ gfx::Vector2d SharedRendererState::GetScrollOffsetOnRT() {
return scroll_offset_;
}
-void SharedRendererState::SetFrameOnUI(scoped_ptr<ChildFrame> frame) {
+void SharedRendererState::SetFrameOnUI(std::unique_ptr<ChildFrame> frame) {
base::AutoLock lock(lock_);
DCHECK(!child_frame_.get());
child_frame_ = std::move(frame);
}
-scoped_ptr<ChildFrame> SharedRendererState::PassFrameOnRT() {
+std::unique_ptr<ChildFrame> SharedRendererState::PassFrameOnRT() {
base::AutoLock lock(lock_);
hardware_renderer_has_frame_ =
hardware_renderer_has_frame_ || child_frame_.get();
return std::move(child_frame_);
}
-scoped_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() {
+std::unique_ptr<ChildFrame> SharedRendererState::PassUncommittedFrameOnUI() {
base::AutoLock lock(lock_);
return std::move(child_frame_);
}
« no previous file with comments | « android_webview/browser/shared_renderer_state.h ('k') | android_webview/browser/test/fake_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698