OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/layers/picture_layer_impl.h" | 5 #include "cc/layers/picture_layer_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <limits> | 10 #include <limits> |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 float page_scale_factor, | 154 float page_scale_factor, |
155 float maximum_animation_contents_scale, | 155 float maximum_animation_contents_scale, |
156 float starting_animation_contents_scale, | 156 float starting_animation_contents_scale, |
157 bool animating_transform_to_screen) { | 157 bool animating_transform_to_screen) { |
158 layer->layer_tree_impl()->SetDeviceScaleFactor(device_scale_factor); | 158 layer->layer_tree_impl()->SetDeviceScaleFactor(device_scale_factor); |
159 host_impl()->active_tree()->SetPageScaleOnActiveTree(page_scale_factor); | 159 host_impl()->active_tree()->SetPageScaleOnActiveTree(page_scale_factor); |
160 | 160 |
161 gfx::Transform scale_transform; | 161 gfx::Transform scale_transform; |
162 scale_transform.Scale(ideal_contents_scale, ideal_contents_scale); | 162 scale_transform.Scale(ideal_contents_scale, ideal_contents_scale); |
163 layer->draw_properties().screen_space_transform = scale_transform; | 163 layer->draw_properties().screen_space_transform = scale_transform; |
164 layer->set_is_drawn_render_surface_layer_list_member(true); | 164 layer->set_contributes_to_drawn_render_surface(true); |
165 DCHECK_EQ(layer->GetIdealContentsScale(), ideal_contents_scale); | 165 DCHECK_EQ(layer->GetIdealContentsScale(), ideal_contents_scale); |
166 layer->layer_tree_impl()->property_trees()->SetAnimationScalesForTesting( | 166 layer->layer_tree_impl()->property_trees()->SetAnimationScalesForTesting( |
167 layer->transform_tree_index(), maximum_animation_contents_scale, | 167 layer->transform_tree_index(), maximum_animation_contents_scale, |
168 starting_animation_contents_scale); | 168 starting_animation_contents_scale); |
169 layer->draw_properties().screen_space_transform_is_animating = | 169 layer->draw_properties().screen_space_transform_is_animating = |
170 animating_transform_to_screen; | 170 animating_transform_to_screen; |
171 } | 171 } |
172 | 172 |
173 void SetupDrawPropertiesAndUpdateTiles( | 173 void SetupDrawPropertiesAndUpdateTiles( |
174 FakePictureLayerImpl* layer, | 174 FakePictureLayerImpl* layer, |
(...skipping 4820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4995 EXPECT_FLOAT_EQ(expected_contents_scale, | 4995 EXPECT_FLOAT_EQ(expected_contents_scale, |
4996 pending_layer_ptr->picture_layer_tiling_set() | 4996 pending_layer_ptr->picture_layer_tiling_set() |
4997 ->FindTilingWithResolution(HIGH_RESOLUTION) | 4997 ->FindTilingWithResolution(HIGH_RESOLUTION) |
4998 ->contents_scale_key()) | 4998 ->contents_scale_key()) |
4999 << "ideal_contents_scale: " << ideal_contents_scale; | 4999 << "ideal_contents_scale: " << ideal_contents_scale; |
5000 } | 5000 } |
5001 } | 5001 } |
5002 | 5002 |
5003 } // namespace | 5003 } // namespace |
5004 } // namespace cc | 5004 } // namespace cc |
OLD | NEW |