cc/surfaces/surface_factory.h - Issue 1128733002: Update from https://crrev.com/328418

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: cc/surfaces/surface_factory.h

Issue 1128733002: Update from https://crrev.com/328418 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 7 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:

Index: cc/surfaces/surface_factory.h

diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h

index b6b627fb28ae3a202771e0d34557181d121f45d4..afc0b8133df15b8d9a22e59d5727e9a567942ce9 100644

--- a/cc/surfaces/surface_factory.h

+++ b/cc/surfaces/surface_factory.h

@@ -68,8 +68,8 @@ class CC_SURFACES_EXPORT SurfaceFactory

SurfaceFactoryClient* client_;

SurfaceResourceHolder holder_;

- typedef base::ScopedPtrHashMap<SurfaceId, Surface> OwningSurfaceMap;

- base::ScopedPtrHashMap<SurfaceId, Surface> surface_map_;

+ typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<Surface>> OwningSurfaceMap;

+ OwningSurfaceMap surface_map_;

DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);

};

« no previous file with comments | « cc/surfaces/surface_aggregator.h ('k') | mojo/common/task_tracker.cc » ('j') | no next file with comments »