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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 // update property trees before using them. | 573 // update property trees before using them. |
574 draw_property_utils::UpdatePageScaleFactor( | 574 draw_property_utils::UpdatePageScaleFactor( |
575 inputs->property_trees, inputs->page_scale_layer, | 575 inputs->property_trees, inputs->page_scale_layer, |
576 inputs->page_scale_factor, inputs->device_scale_factor, | 576 inputs->page_scale_factor, inputs->device_scale_factor, |
577 inputs->device_transform); | 577 inputs->device_transform); |
578 draw_property_utils::UpdateElasticOverscroll( | 578 draw_property_utils::UpdateElasticOverscroll( |
579 inputs->property_trees, inputs->elastic_overscroll_application_layer, | 579 inputs->property_trees, inputs->elastic_overscroll_application_layer, |
580 inputs->elastic_overscroll); | 580 inputs->elastic_overscroll); |
581 // Similarly, the device viewport and device transform are shared | 581 // Similarly, the device viewport and device transform are shared |
582 // by both trees. | 582 // by both trees. |
583 PropertyTrees* property_trees = inputs->property_trees; | 583 inputs->property_trees->clip_tree.SetViewportClip( |
584 property_trees->clip_tree.SetViewportClip( | |
585 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); | 584 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); |
586 float page_scale_factor_for_root = | 585 inputs->property_trees->transform_tree.SetDeviceTransform( |
587 inputs->page_scale_layer == inputs->root_layer | |
588 ? inputs->page_scale_factor | |
589 : 1.f; | |
590 property_trees->transform_tree.SetRootTransformsAndScales( | |
591 inputs->device_scale_factor, page_scale_factor_for_root, | |
592 inputs->device_transform, inputs->root_layer->position()); | 586 inputs->device_transform, inputs->root_layer->position()); |
| 587 inputs->property_trees->transform_tree.SetDeviceTransformScaleFactor( |
| 588 inputs->device_transform); |
593 draw_property_utils::ComputeVisibleRects( | 589 draw_property_utils::ComputeVisibleRects( |
594 inputs->root_layer, inputs->property_trees, | 590 inputs->root_layer, inputs->property_trees, |
595 inputs->can_render_to_separate_surface, &visible_layer_list); | 591 inputs->can_render_to_separate_surface, &visible_layer_list); |
596 break; | 592 break; |
597 } | 593 } |
598 } | 594 } |
599 | 595 |
600 if (should_measure_property_tree_performance) { | 596 if (should_measure_property_tree_performance) { |
601 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 597 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
602 "LayerTreeHostCommon::CalculateDrawProperties"); | 598 "LayerTreeHostCommon::CalculateDrawProperties"); |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 | 706 |
711 PropertyTrees* GetPropertyTrees(Layer* layer) { | 707 PropertyTrees* GetPropertyTrees(Layer* layer) { |
712 return layer->GetLayerTree()->property_trees(); | 708 return layer->GetLayerTree()->property_trees(); |
713 } | 709 } |
714 | 710 |
715 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 711 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
716 return layer->layer_tree_impl()->property_trees(); | 712 return layer->layer_tree_impl()->property_trees(); |
717 } | 713 } |
718 | 714 |
719 } // namespace cc | 715 } // namespace cc |
OLD | NEW |