| 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 PropertyTrees* property_trees = inputs->property_trees; | 586 inputs->property_trees->clip_tree.SetViewportClip( |
| 587 property_trees->clip_tree.SetViewportClip( | |
| 588 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); | 587 gfx::RectF(gfx::SizeF(inputs->device_viewport_size))); |
| 589 float page_scale_factor_for_root = | 588 inputs->property_trees->transform_tree.SetDeviceTransform( |
| 590 inputs->page_scale_layer == inputs->root_layer | |
| 591 ? inputs->page_scale_factor | |
| 592 : 1.f; | |
| 593 property_trees->transform_tree.SetRootTransformsAndScales( | |
| 594 inputs->device_scale_factor, page_scale_factor_for_root, | |
| 595 inputs->device_transform, inputs->root_layer->position()); | 589 inputs->device_transform, inputs->root_layer->position()); |
| 590 inputs->property_trees->transform_tree.SetDeviceTransformScaleFactor( |
| 591 inputs->device_transform); |
| 596 draw_property_utils::ComputeVisibleRects( | 592 draw_property_utils::ComputeVisibleRects( |
| 597 inputs->root_layer, inputs->property_trees, | 593 inputs->root_layer, inputs->property_trees, |
| 598 inputs->can_render_to_separate_surface, &visible_layer_list); | 594 inputs->can_render_to_separate_surface, &visible_layer_list); |
| 599 break; | 595 break; |
| 600 } | 596 } |
| 601 } | 597 } |
| 602 | 598 |
| 603 if (should_measure_property_tree_performance) { | 599 if (should_measure_property_tree_performance) { |
| 604 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 600 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
| 605 "LayerTreeHostCommon::CalculateDrawProperties"); | 601 "LayerTreeHostCommon::CalculateDrawProperties"); |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 | 713 |
| 718 PropertyTrees* GetPropertyTrees(Layer* layer) { | 714 PropertyTrees* GetPropertyTrees(Layer* layer) { |
| 719 return layer->GetLayerTree()->property_trees(); | 715 return layer->GetLayerTree()->property_trees(); |
| 720 } | 716 } |
| 721 | 717 |
| 722 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 718 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
| 723 return layer->layer_tree_impl()->property_trees(); | 719 return layer->layer_tree_impl()->property_trees(); |
| 724 } | 720 } |
| 725 | 721 |
| 726 } // namespace cc | 722 } // namespace cc |
| OLD | NEW |