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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 // update property trees before using them. | 576 // update property trees before using them. |
577 draw_property_utils::UpdatePageScaleFactor( | 577 draw_property_utils::UpdatePageScaleFactor( |
578 inputs->property_trees, inputs->page_scale_layer, | 578 inputs->property_trees, inputs->page_scale_layer, |
579 inputs->page_scale_factor, inputs->device_scale_factor, | 579 inputs->page_scale_factor, inputs->device_scale_factor, |
580 inputs->device_transform); | 580 inputs->device_transform); |
581 draw_property_utils::UpdateElasticOverscroll( | 581 draw_property_utils::UpdateElasticOverscroll( |
582 inputs->property_trees, inputs->elastic_overscroll_application_layer, | 582 inputs->property_trees, inputs->elastic_overscroll_application_layer, |
583 inputs->elastic_overscroll); | 583 inputs->elastic_overscroll); |
584 // Similarly, the device viewport and device transform are shared | 584 // Similarly, the device viewport and device transform are shared |
585 // by both trees. | 585 // by both trees. |
586 inputs->property_trees->clip_tree.SetViewportClip( | 586 PropertyTrees* property_trees = inputs->property_trees; |
| 587 property_trees->clip_tree.SetViewportClip( |
587 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); | 588 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); |
588 inputs->property_trees->transform_tree.SetDeviceTransform( | 589 float page_scale_factor_for_root = |
| 590 inputs->page_scale_layer == inputs->root_layer |
| 591 ? inputs->page_scale_factor |
| 592 : 1.f; |
| 593 property_trees->transform_tree.SetScreenSpaceScale( |
| 594 inputs->device_scale_factor, page_scale_factor_for_root, |
| 595 inputs->device_transform); |
| 596 property_trees->transform_tree.SetDeviceTransform( |
589 inputs->device_transform, inputs->root_layer->position()); | 597 inputs->device_transform, inputs->root_layer->position()); |
590 inputs->property_trees->transform_tree.SetDeviceTransformScaleFactor( | 598 property_trees->transform_tree.SetDeviceTransformScaleFactor( |
591 inputs->device_transform); | 599 inputs->device_transform); |
592 draw_property_utils::ComputeVisibleRects( | 600 draw_property_utils::ComputeVisibleRects( |
593 inputs->root_layer, inputs->property_trees, | 601 inputs->root_layer, inputs->property_trees, |
594 inputs->can_render_to_separate_surface, &visible_layer_list); | 602 inputs->can_render_to_separate_surface, &visible_layer_list); |
595 break; | 603 break; |
596 } | 604 } |
597 } | 605 } |
598 | 606 |
599 if (should_measure_property_tree_performance) { | 607 if (should_measure_property_tree_performance) { |
600 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 608 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 | 721 |
714 PropertyTrees* GetPropertyTrees(Layer* layer) { | 722 PropertyTrees* GetPropertyTrees(Layer* layer) { |
715 return layer->GetLayerTree()->property_trees(); | 723 return layer->GetLayerTree()->property_trees(); |
716 } | 724 } |
717 | 725 |
718 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 726 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
719 return layer->layer_tree_impl()->property_trees(); | 727 return layer->layer_tree_impl()->property_trees(); |
720 } | 728 } |
721 | 729 |
722 } // namespace cc | 730 } // namespace cc |
OLD | NEW |