cc/layers/picture_image_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/picture_image_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/picture_image_layer_impl_unittest.cc

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

index 3f1d36ce766c13f73f5a208e954d3aa0d6c36713..06f53efcf2501147e0695b74f689b6d3b1773ac8 100644

--- a/cc/layers/picture_image_layer_impl_unittest.cc

+++ b/cc/layers/picture_image_layer_impl_unittest.cc

@@ -43,7 +43,8 @@

&shared_bitmap_manager_) {

tiling_client_.SetTileSize(ImplSidePaintingSettings().default_tile_size);

host_impl_.CreatePendingTree();

- host_impl_.InitializeRenderer(FakeOutputSurface::Create3d());

+ host_impl_.InitializeRenderer(

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

}

scoped_ptr<TestablePictureImageLayerImpl> CreateLayer(int id,

@@ -125,7 +126,7 @@

EXPECT_EQ(1.f, pending_layer->tilings()->tiling_at(0)->contents_scale());

// Push to active layer.

- host_impl_.pending_tree()->SetRootLayer(pending_layer.Pass());

+ host_impl_.pending_tree()->SetRootLayer(pending_layer.PassAs<LayerImpl>());

host_impl_.ActivateSyncTree();

TestablePictureImageLayerImpl* active_layer =

static_cast<TestablePictureImageLayerImpl*>(

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