cc/layers/layer_proto_converter.cc - Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere.

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_proto_converter.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid

Patch Set: Rebase. Created 4 years, 9 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

« cc/layers/heads_up_display_layer.cc ('K') | « cc/layers/layer_position_constraint_unittest.cc ('k') | cc/layers/layer_proto_converter_unittest.cc » ('j') | cc/layers/layer_utils_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/layers/layer_proto_converter.cc

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

index 19215c9f92eed97ed73c612baee5c553c9a2b0fd..921028fecbeb59d9766b2c1c7a8bde48d0bd2ffe 100644

--- a/cc/layers/layer_proto_converter.cc

+++ b/cc/layers/layer_proto_converter.cc

@@ -8,7 +8,6 @@

#include "cc/layers/empty_content_layer_client.h"

#include "cc/layers/heads_up_display_layer.h"

#include "cc/layers/layer.h"

-#include "cc/layers/layer_settings.h"

#include "cc/layers/picture_layer.h"

#include "cc/proto/layer.pb.h"

#include "cc/trees/layer_tree_host_common.h"

@@ -113,12 +112,11 @@ scoped_refptr<Layer> LayerProtoConverter::FindOrAllocateAndConstruct(

// layer type we don't support.

case proto::LayerNode::UNKNOWN:

case proto::LayerNode::LAYER:

- return Layer::Create(LayerSettings()).get();

+ return Layer::Create().get();

case proto::LayerNode::PICTURE_LAYER:

- return PictureLayer::Create(LayerSettings(),

- EmptyContentLayerClient::GetInstance());

+ return PictureLayer::Create(EmptyContentLayerClient::GetInstance());

case proto::LayerNode::HEADS_UP_DISPLAY_LAYER:

- return HeadsUpDisplayLayer::Create(LayerSettings());

+ return HeadsUpDisplayLayer::Create();

}

// TODO(nyquist): Add the rest of the necessary LayerTypes. This function

// should not return null.