| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 DCHECK_EQ(scrolls.size(), 0u); | 181 DCHECK_EQ(scrolls.size(), 0u); |
| 182 for (int i = 0; i < proto.scrolls_size(); ++i) { | 182 for (int i = 0; i < proto.scrolls_size(); ++i) { |
| 183 scrolls.push_back(LayerTreeHostCommon::ScrollUpdateInfo()); | 183 scrolls.push_back(LayerTreeHostCommon::ScrollUpdateInfo()); |
| 184 scrolls[i].FromProtobuf(proto.scrolls(i)); | 184 scrolls[i].FromProtobuf(proto.scrolls(i)); |
| 185 } | 185 } |
| 186 page_scale_delta = proto.page_scale_delta(); | 186 page_scale_delta = proto.page_scale_delta(); |
| 187 elastic_overscroll_delta = ProtoToVector2dF(proto.elastic_overscroll_delta()); | 187 elastic_overscroll_delta = ProtoToVector2dF(proto.elastic_overscroll_delta()); |
| 188 top_controls_delta = proto.top_controls_delta(); | 188 top_controls_delta = proto.top_controls_delta(); |
| 189 } | 189 } |
| 190 | 190 |
| 191 | |
| 192 static inline void SetMaskLayersAreDrawnRenderSurfaceLayerListMembers( | 191 static inline void SetMaskLayersAreDrawnRenderSurfaceLayerListMembers( |
| 193 LayerImpl* layer) { | 192 LayerImpl* layer) { |
| 194 if (layer->mask_layer()) | 193 if (layer->mask_layer()) |
| 195 layer->mask_layer()->set_is_drawn_render_surface_layer_list_member(true); | 194 layer->mask_layer()->set_is_drawn_render_surface_layer_list_member(true); |
| 196 if (layer->replica_layer() && layer->replica_layer()->mask_layer()) { | 195 if (layer->replica_layer() && layer->replica_layer()->mask_layer()) { |
| 197 layer->replica_layer() | 196 layer->replica_layer() |
| 198 ->mask_layer() | 197 ->mask_layer() |
| 199 ->set_is_drawn_render_surface_layer_list_member(true); | 198 ->set_is_drawn_render_surface_layer_list_member(true); |
| 200 } | 199 } |
| 201 } | 200 } |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 | 698 |
| 700 PropertyTrees* GetPropertyTrees(Layer* layer) { | 699 PropertyTrees* GetPropertyTrees(Layer* layer) { |
| 701 return layer->layer_tree_host()->property_trees(); | 700 return layer->layer_tree_host()->property_trees(); |
| 702 } | 701 } |
| 703 | 702 |
| 704 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 703 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
| 705 return layer->layer_tree_impl()->property_trees(); | 704 return layer->layer_tree_impl()->property_trees(); |
| 706 } | 705 } |
| 707 | 706 |
| 708 } // namespace cc | 707 } // namespace cc |
| OLD | NEW |