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

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

index 18d9d1ebf9fec6de57ebd29bb90bff0aa85c0186..f7f97927d7ddcd549f1905d0a155e790bc7b0876 100644

--- a/cc/layers/tiled_layer_impl.cc

+++ b/cc/layers/tiled_layer_impl.cc

@@ -85,7 +85,7 @@

DrawableTile* TiledLayerImpl::CreateTile(int i, int j) {

scoped_ptr<DrawableTile> tile(DrawableTile::Create());

DrawableTile* added_tile = tile.get();

- tiler_->AddTile(tile.Pass(), i, j);

+ tiler_->AddTile(tile.PassAs<LayerTilingData::Tile>(), i, j);

return added_tile;

}

@@ -98,7 +98,7 @@

scoped_ptr<LayerImpl> TiledLayerImpl::CreateLayerImpl(

LayerTreeImpl* tree_impl) {

- return TiledLayerImpl::Create(tree_impl, id());

+ return TiledLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();

}

void TiledLayerImpl::AsValueInto(base::debug::TracedValue* state) const {

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