diff options
| author | dtrainor <dtrainor@chromium.org> | 2016-01-04 01:53:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 09:54:21 +0000 |
| commit | 8e9da48fa5086b27e076b21f729254cc8451c923 (patch) | |
| tree | e9dce6ef8014c4a59ad12d3fdcf66f675e9424fe /cc/layers/layer.cc | |
| parent | 5b06f2d1b704eec621a691f55fd16db08a5e6554 (diff) | |
| download | chromium_src-8e9da48fa5086b27e076b21f729254cc8451c923.zip chromium_src-8e9da48fa5086b27e076b21f729254cc8451c923.tar.gz chromium_src-8e9da48fa5086b27e076b21f729254cc8451c923.tar.bz2 | |
Serialize PictureLayer properties.
Serialize the properties specific to the PictureLayer subclass. This
required a few slight changes:
- Don't query LayerImpl::bounds() in PictureLayer::PushPropertiesTo().
Instead rely on either Layer::bounds() or
Layer::paint_properties().bounds depending on the
source_frame_number. Since LayerImpl's bounds are set by
Layer::PushPropertiesTo() right before this check, this should
result in the same behavior.
- Create an EmptyContentLayerClient to be used by all PictureLayer
instances created by
LayerProtoConverter::FindOrAllocateAndConstruct().
BUG=538710
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1527863002
Cr-Commit-Position: refs/heads/master@{#367300}
Diffstat (limited to 'cc/layers/layer.cc')
| -rw-r--r-- | cc/layers/layer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 663f4ae..9d82b58 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -1361,7 +1361,7 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { } void Layer::SetTypeForProtoSerialization(proto::LayerNode* proto) const { - proto->set_type(proto::LayerType::Base); + proto->set_type(proto::LayerType::LAYER); } void Layer::ToLayerNodeProto(proto::LayerNode* proto) const { |