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 inputs->property_trees->clip_tree.SetViewportClip( | 583 PropertyTrees* property_trees = inputs->property_trees; |
| 584 property_trees->clip_tree.SetViewportClip( |
584 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); | 585 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); |
585 inputs->property_trees->transform_tree.SetDeviceTransform( | 586 float page_scale_factor_for_root = |
| 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, |
586 inputs->device_transform, inputs->root_layer->position()); | 592 inputs->device_transform, inputs->root_layer->position()); |
587 inputs->property_trees->transform_tree.SetDeviceTransformScaleFactor( | |
588 inputs->device_transform); | |
589 draw_property_utils::ComputeVisibleRects( | 593 draw_property_utils::ComputeVisibleRects( |
590 inputs->root_layer, inputs->property_trees, | 594 inputs->root_layer, inputs->property_trees, |
591 inputs->can_render_to_separate_surface, &visible_layer_list); | 595 inputs->can_render_to_separate_surface, &visible_layer_list); |
592 break; | 596 break; |
593 } | 597 } |
594 } | 598 } |
595 | 599 |
596 if (should_measure_property_tree_performance) { | 600 if (should_measure_property_tree_performance) { |
597 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 601 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
598 "LayerTreeHostCommon::CalculateDrawProperties"); | 602 "LayerTreeHostCommon::CalculateDrawProperties"); |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
707 | 711 |
708 PropertyTrees* GetPropertyTrees(Layer* layer) { | 712 PropertyTrees* GetPropertyTrees(Layer* layer) { |
709 return layer->GetLayerTree()->property_trees(); | 713 return layer->GetLayerTree()->property_trees(); |
710 } | 714 } |
711 | 715 |
712 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 716 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
713 return layer->layer_tree_impl()->property_trees(); | 717 return layer->layer_tree_impl()->property_trees(); |
714 } | 718 } |
715 | 719 |
716 } // namespace cc | 720 } // namespace cc |
OLD | NEW |