Chromium Code Reviews| Index: cc/playback/display_list_recording_source.cc |
| diff --git a/cc/playback/display_list_recording_source.cc b/cc/playback/display_list_recording_source.cc |
| index 57602fbbc6351d0b82f519433126da4f8c30a046..c846bf44b1a59a15ed63b1631a1b47e83c56afa6 100644 |
| --- a/cc/playback/display_list_recording_source.cc |
| +++ b/cc/playback/display_list_recording_source.cc |
| @@ -59,7 +59,8 @@ void DisplayListRecordingSource::ToProtobuf( |
| proto->set_clear_canvas_with_debug_color(clear_canvas_with_debug_color_); |
| proto->set_solid_color(static_cast<uint64_t>(solid_color_)); |
| proto->set_background_color(static_cast<uint64_t>(background_color_)); |
| - display_list_->ToProtobuf(proto->mutable_display_list()); |
| + if (display_list_) |
| + display_list_->ToProtobuf(proto->mutable_display_list()); |
| } |
| void DisplayListRecordingSource::FromProtobuf( |
| @@ -75,9 +76,12 @@ void DisplayListRecordingSource::FromProtobuf( |
| clear_canvas_with_debug_color_ = proto.clear_canvas_with_debug_color(); |
| solid_color_ = static_cast<SkColor>(proto.solid_color()); |
| background_color_ = static_cast<SkColor>(proto.background_color()); |
| - display_list_ = DisplayItemList::CreateFromProto(proto.display_list()); |
| - |
| - FinishDisplayItemListUpdate(); |
| + if (proto.has_display_list()) { |
|
vmpstr
2015/12/16 04:21:08
When would it not? Can you leave a comment?
David Trainor- moved to gerrit
2015/12/16 19:10:58
If we serialized an empty RecordingSource (which h
|
| + display_list_ = DisplayItemList::CreateFromProto(proto.display_list()); |
| + FinishDisplayItemListUpdate(); |
| + } else { |
| + display_list_ = nullptr; |
| + } |
| } |
| void DisplayListRecordingSource::UpdateInvalidationForNewViewport( |