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

Unified Diff: android_webview/browser/shared_renderer_state.h

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
Index: android_webview/browser/shared_renderer_state.h
diff --git a/android_webview/browser/shared_renderer_state.h b/android_webview/browser/shared_renderer_state.h
index 8dd938cede38d2d7e461c2fb399c03d1a8df5a1d..b7eccc42e429e16171364260151765a4cc8e4d7e 100644
--- a/android_webview/browser/shared_renderer_state.h
+++ b/android_webview/browser/shared_renderer_state.h
@@ -52,18 +52,18 @@ class SharedRendererState {
// UI thread methods.
void SetScrollOffsetOnUI(gfx::Vector2d scroll_offset);
- void SetFrameOnUI(scoped_ptr<ChildFrame> frame);
+ void SetFrameOnUI(std::unique_ptr<ChildFrame> frame);
void InitializeHardwareDrawIfNeededOnUI();
ParentCompositorDrawConstraints GetParentDrawConstraintsOnUI() const;
void SwapReturnedResourcesOnUI(ReturnedResourcesMap* returned_resource_map);
bool ReturnedResourcesEmptyOnUI() const;
- scoped_ptr<ChildFrame> PassUncommittedFrameOnUI();
+ std::unique_ptr<ChildFrame> PassUncommittedFrameOnUI();
bool HasFrameOnUI() const;
void DeleteHardwareRendererOnUI();
// RT thread methods.
gfx::Vector2d GetScrollOffsetOnRT();
- scoped_ptr<ChildFrame> PassFrameOnRT();
+ std::unique_ptr<ChildFrame> PassFrameOnRT();
void DrawGL(AwDrawGLInfo* draw_info);
void PostExternalDrawConstraintsToChildCompositorOnRT(
const ParentCompositorDrawConstraints& parent_draw_constraints);
@@ -100,7 +100,7 @@ class SharedRendererState {
base::CancelableClosure request_draw_gl_cancelable_closure_;
// Accessed by RT thread.
- scoped_ptr<HardwareRenderer> hardware_renderer_;
+ std::unique_ptr<HardwareRenderer> hardware_renderer_;
// This is accessed by both UI and RT now. TODO(hush): move to RT only.
GLViewRendererManager::Key renderer_manager_key_;
@@ -109,7 +109,7 @@ class SharedRendererState {
mutable base::Lock lock_;
bool hardware_renderer_has_frame_;
gfx::Vector2d scroll_offset_;
- scoped_ptr<ChildFrame> child_frame_;
+ std::unique_ptr<ChildFrame> child_frame_;
bool inside_hardware_release_;
ParentCompositorDrawConstraints parent_draw_constraints_;
ReturnedResourcesMap returned_resources_map_;
« no previous file with comments | « android_webview/browser/scoped_app_gl_state_restore.h ('k') | android_webview/browser/shared_renderer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698