content/browser/android/in_process_surface_texture_manager.h - Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/in_process_surface_texture_manager.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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 | « content/browser/android/in_process/synchronous_compositor_impl.cc ('k') | content/browser/android/in_process_surface_texture_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/in_process_surface_texture_manager.h

diff --git a/content/browser/android/in_process_surface_texture_manager.h b/content/browser/android/in_process_surface_texture_manager.h

index 8cf4d2eebdda975e4259391d5a7673206e9912e8..871c06d65d37486a41553cb52cd96f2be69c59b8 100644

--- a/content/browser/android/in_process_surface_texture_manager.h

+++ b/content/browser/android/in_process_surface_texture_manager.h

@@ -7,9 +7,10 @@

#include "gpu/ipc/common/android/surface_texture_manager.h"

+#include <memory>

#include "base/containers/scoped_ptr_hash_map.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/singleton.h"

#include "base/synchronization/lock.h"

#include "content/common/content_export.h"

@@ -46,7 +47,7 @@ class CONTENT_EXPORT InProcessSurfaceTextureManager

~InProcessSurfaceTextureManager() override;

using SurfaceTextureMap =

- base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;

+ base::ScopedPtrHashMap<int, std::unique_ptr<gfx::ScopedJavaSurface>>;

SurfaceTextureMap surface_textures_;

base::Lock lock_;