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_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
556 void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) { | 556 void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) { |
557 DCHECK(IsActiveTree()); | 557 DCHECK(IsActiveTree()); |
558 if (page_scale_factor()->SetCurrent( | 558 if (page_scale_factor()->SetCurrent( |
559 ClampPageScaleFactorToLimits(active_page_scale))) { | 559 ClampPageScaleFactorToLimits(active_page_scale))) { |
560 DidUpdatePageScale(); | 560 DidUpdatePageScale(); |
561 if (PageScaleLayer()) { | 561 if (PageScaleLayer()) { |
562 draw_property_utils::UpdatePageScaleFactor( | 562 draw_property_utils::UpdatePageScaleFactor( |
563 property_trees(), PageScaleLayer(), current_page_scale_factor(), | 563 property_trees(), PageScaleLayer(), current_page_scale_factor(), |
564 device_scale_factor(), layer_tree_host_impl_->DrawTransform()); | 564 device_scale_factor(), layer_tree_host_impl_->DrawTransform()); |
565 } else { | 565 } else { |
566 DCHECK(!root_layer_ || active_page_scale == 1); | 566 DCHECK(!root_layer_ || active_page_scale == 1 || |
567 root_layer_->transform_tree_index() == -1); | |
jaydasika
2016/03/22 00:19:07
have to remove this (added it to make unit tests p
ajuma
2016/03/22 14:41:55
Could it be that the page_scale_layer_id is invali
| |
567 } | 568 } |
568 } | 569 } |
569 } | 570 } |
570 | 571 |
571 void LayerTreeImpl::PushPageScaleFromMainThread(float page_scale_factor, | 572 void LayerTreeImpl::PushPageScaleFromMainThread(float page_scale_factor, |
572 float min_page_scale_factor, | 573 float min_page_scale_factor, |
573 float max_page_scale_factor) { | 574 float max_page_scale_factor) { |
574 PushPageScaleFactorAndLimits(&page_scale_factor, min_page_scale_factor, | 575 PushPageScaleFactorAndLimits(&page_scale_factor, min_page_scale_factor, |
575 max_page_scale_factor); | 576 max_page_scale_factor); |
576 } | 577 } |
(...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2062 } | 2063 } |
2063 | 2064 |
2064 void LayerTreeImpl::ResetAllChangeTracking(PropertyTrees::ResetFlags flag) { | 2065 void LayerTreeImpl::ResetAllChangeTracking(PropertyTrees::ResetFlags flag) { |
2065 layers_that_should_push_properties_.clear(); | 2066 layers_that_should_push_properties_.clear(); |
2066 for (auto* layer : *this) | 2067 for (auto* layer : *this) |
2067 layer->ResetChangeTracking(); | 2068 layer->ResetChangeTracking(); |
2068 property_trees_.ResetAllChangeTracking(flag); | 2069 property_trees_.ResetAllChangeTracking(flag); |
2069 } | 2070 } |
2070 | 2071 |
2071 } // namespace cc | 2072 } // namespace cc |
OLD | NEW |