cc/layers/layer_impl_unittest.cc - Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_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: cc/layers/layer_impl_unittest.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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: cc/layers/layer_impl_unittest.cc

diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc

index b9366acfbd74dba95ecc473bc392fc0e561857db..c5cac8dfe841356828ab284f42931e1922699d5a 100644

--- a/cc/layers/layer_impl_unittest.cc

+++ b/cc/layers/layer_impl_unittest.cc

@@ -86,7 +86,8 @@

FakeImplProxy proxy;

TestSharedBitmapManager shared_bitmap_manager;

FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager);

- EXPECT_TRUE(host_impl.InitializeRenderer(FakeOutputSurface::Create3d()));

+ EXPECT_TRUE(host_impl.InitializeRenderer(

+ FakeOutputSurface::Create3d().PassAs<OutputSurface>()));

scoped_ptr<LayerImpl> root_clip =

LayerImpl::Create(host_impl.active_tree(), 1);

scoped_ptr<LayerImpl> root_ptr =

@@ -246,7 +247,8 @@

FakeImplProxy proxy;

TestSharedBitmapManager shared_bitmap_manager;

FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager);

- EXPECT_TRUE(host_impl.InitializeRenderer(FakeOutputSurface::Create3d()));

+ EXPECT_TRUE(host_impl.InitializeRenderer(

+ FakeOutputSurface::Create3d().PassAs<OutputSurface>()));

host_impl.active_tree()->SetRootLayer(

LayerImpl::Create(host_impl.active_tree(), 1));

LayerImpl* root = host_impl.active_tree()->root_layer();

@@ -355,7 +357,8 @@

FakeImplProxy proxy;

TestSharedBitmapManager shared_bitmap_manager;

FakeLayerTreeHostImpl host_impl(&proxy, &shared_bitmap_manager);

- EXPECT_TRUE(host_impl.InitializeRenderer(FakeOutputSurface::Create3d()));

+ EXPECT_TRUE(host_impl.InitializeRenderer(

+ FakeOutputSurface::Create3d().PassAs<OutputSurface>()));

scoped_ptr<LayerImpl> layer = LayerImpl::Create(host_impl.active_tree(), 1);

for (int contents_opaque = 0; contents_opaque < 2; ++contents_opaque) {

« no previous file with comments | « cc/layers/layer_impl.cc ('k') | cc/layers/layer_perftest.cc » ('j') | no next file with comments »