| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/layer_proto_converter.h" | 5 #include "cc/layers/layer_proto_converter.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
| 9 #include "cc/layers/empty_content_layer_client.h" | 9 #include "cc/layers/empty_content_layer_client.h" |
| 10 #include "cc/layers/heads_up_display_layer.h" | 10 #include "cc/layers/heads_up_display_layer.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 new_root->FromLayerNodeProto(root_node, layer_id_map, layer_tree_host); | 51 new_root->FromLayerNodeProto(root_node, layer_id_map, layer_tree_host); |
| 52 return new_root; | 52 return new_root; |
| 53 } | 53 } |
| 54 | 54 |
| 55 // static | 55 // static |
| 56 void LayerProtoConverter::SerializeLayerProperties( | 56 void LayerProtoConverter::SerializeLayerProperties( |
| 57 LayerTreeHost* host, | 57 LayerTreeHost* host, |
| 58 proto::LayerUpdate* layer_update) { | 58 proto::LayerUpdate* layer_update) { |
| 59 TRACE_EVENT0("cc.remote", "LayerProtoConverter::SerializeLayerProperties"); | 59 TRACE_EVENT0("cc.remote", "LayerProtoConverter::SerializeLayerProperties"); |
| 60 for (auto layer : host->LayersThatShouldPushProperties()) | 60 for (auto layer : host->GetLayerTree()->LayersThatShouldPushProperties()) |
| 61 layer->ToLayerPropertiesProto(layer_update); | 61 layer->ToLayerPropertiesProto(layer_update); |
| 62 host->LayersThatShouldPushProperties().clear(); | 62 host->GetLayerTree()->LayersThatShouldPushProperties().clear(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // static | 65 // static |
| 66 void LayerProtoConverter::DeserializeLayerProperties( | 66 void LayerProtoConverter::DeserializeLayerProperties( |
| 67 Layer* existing_root, | 67 Layer* existing_root, |
| 68 const proto::LayerUpdate& layer_update) { | 68 const proto::LayerUpdate& layer_update) { |
| 69 DCHECK(existing_root); | 69 DCHECK(existing_root); |
| 70 LayerIdMap layer_id_map; | 70 LayerIdMap layer_id_map; |
| 71 RecursivelyFindAllLayers(existing_root, &layer_id_map); | 71 RecursivelyFindAllLayers(existing_root, &layer_id_map); |
| 72 | 72 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 return SolidColorScrollbarLayer::Create(ScrollbarOrientation::HORIZONTAL, | 118 return SolidColorScrollbarLayer::Create(ScrollbarOrientation::HORIZONTAL, |
| 119 -1, -1, false, Layer::INVALID_ID); | 119 -1, -1, false, Layer::INVALID_ID); |
| 120 } | 120 } |
| 121 // TODO(nyquist): Add the rest of the necessary LayerTypes. This function | 121 // TODO(nyquist): Add the rest of the necessary LayerTypes. This function |
| 122 // should not return null. | 122 // should not return null. |
| 123 NOTREACHED(); | 123 NOTREACHED(); |
| 124 return nullptr; | 124 return nullptr; |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace cc | 127 } // namespace cc |
| OLD | NEW |