summaryrefslogtreecommitdiffstats
path: root/blimp
diff options
context:
space:
mode:
authordtrainor <dtrainor@chromium.org>2016-01-04 01:53:05 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-04 09:54:21 +0000
commit8e9da48fa5086b27e076b21f729254cc8451c923 (patch)
treee9dce6ef8014c4a59ad12d3fdcf66f675e9424fe /blimp
parent5b06f2d1b704eec621a691f55fd16db08a5e6554 (diff)
downloadchromium_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 'blimp')
-rw-r--r--blimp/common/proto/blimp_message.proto3
-rw-r--r--blimp/common/proto/input.proto3
-rw-r--r--blimp/common/proto/tab_control.proto3
3 files changed, 6 insertions, 3 deletions
diff --git a/blimp/common/proto/blimp_message.proto b/blimp/common/proto/blimp_message.proto
index 733c21fd..db73e03 100644
--- a/blimp/common/proto/blimp_message.proto
+++ b/blimp/common/proto/blimp_message.proto
@@ -66,7 +66,8 @@ message BlimpMessage {
// Feature-specific messages follow.
// Only one of these fields may be set per BlimpMessage.
- // TODO(kmarshall): use a 'oneof' union when it's supported in Chromium.
+ // TODO(kmarshall): use a 'oneof' union when it's supported in Chromium. See
+ // crbug.com/570371.
optional TabControlMessage tab_control = 1000;
optional NavigationMessage navigation = 1001;
optional RenderWidgetMessage render_widget = 1002;
diff --git a/blimp/common/proto/input.proto b/blimp/common/proto/input.proto
index 7b9a404..a411fc4 100644
--- a/blimp/common/proto/input.proto
+++ b/blimp/common/proto/input.proto
@@ -87,7 +87,8 @@ message InputMessage {
// Input event specific messages follow.
// Only one of these fields may be set per InputMessage.
- // TODO(dtrainor): use a 'oneof' union when it's supported in Chromium.
+ // TODO(dtrainor): use a 'oneof' union when it's supported in Chromium. See
+ // crbug.com/570371.
optional GestureScrollBegin gesture_scroll_begin = 4;
optional GestureScrollUpdate gesture_scroll_update = 5;
optional GestureFlingStart gesture_fling_start = 6;
diff --git a/blimp/common/proto/tab_control.proto b/blimp/common/proto/tab_control.proto
index d71397c..ead55f0 100644
--- a/blimp/common/proto/tab_control.proto
+++ b/blimp/common/proto/tab_control.proto
@@ -28,6 +28,7 @@ message TabControlMessage {
// Feature-specific messages follow.
// Only one of these fields may be set per TabControlMessage.
- // TODO(kmarshall): use a 'oneof' union when it's supported in Chromium.
+ // TODO(kmarshall): use a 'oneof' union when it's supported in Chromium. See
+ // crbug.com/570371.
optional SizeMessage size = 1000;
}