Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(861)

Side by Side Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 2881653002: Remove Layer{Impl}::TransformIsAnimating. (Closed)
Patch Set: Sync to head. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include <memory> 10 #include <memory>
(...skipping 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after
2127 child->test_properties()->transform = large_transform; 2127 child->test_properties()->transform = large_transform;
2128 child->SetBounds(gfx::Size(10, 10)); 2128 child->SetBounds(gfx::Size(10, 10));
2129 grand_child->test_properties()->transform = large_transform; 2129 grand_child->test_properties()->transform = large_transform;
2130 grand_child->SetBounds(gfx::Size(10, 10)); 2130 grand_child->SetBounds(gfx::Size(10, 10));
2131 grand_child->SetDrawsContent(true); 2131 grand_child->SetDrawsContent(true);
2132 ExecuteCalculateDrawProperties(root); 2132 ExecuteCalculateDrawProperties(root);
2133 2133
2134 EXPECT_EQ(gfx::Rect(), grand_child->visible_layer_rect()); 2134 EXPECT_EQ(gfx::Rect(), grand_child->visible_layer_rect());
2135 } 2135 }
2136 2136
2137 static bool TransformIsAnimating(LayerImpl* layer) {
2138 return layer->GetMutatorHost()->IsAnimatingTransformProperty(
2139 layer->element_id(), layer->GetElementTypeForAnimation());
2140 }
2141
2137 TEST_F(LayerTreeHostCommonTest, 2142 TEST_F(LayerTreeHostCommonTest,
2138 ScreenSpaceTransformIsAnimatingWithDelayedAnimation) { 2143 ScreenSpaceTransformIsAnimatingWithDelayedAnimation) {
2139 LayerImpl* root = root_layer_for_testing(); 2144 LayerImpl* root = root_layer_for_testing();
2140 LayerImpl* child = AddChild<LayerImpl>(root); 2145 LayerImpl* child = AddChild<LayerImpl>(root);
2141 LayerImpl* grand_child = AddChild<LayerImpl>(child); 2146 LayerImpl* grand_child = AddChild<LayerImpl>(child);
2142 LayerImpl* great_grand_child = AddChild<LayerImpl>(grand_child); 2147 LayerImpl* great_grand_child = AddChild<LayerImpl>(grand_child);
2143 2148
2144 root->SetDrawsContent(true); 2149 root->SetDrawsContent(true);
2145 child->SetDrawsContent(true); 2150 child->SetDrawsContent(true);
2146 grand_child->SetDrawsContent(true); 2151 grand_child->SetDrawsContent(true);
(...skipping 12 matching lines...) Expand all
2159 TargetProperty::TRANSFORM); 2164 TargetProperty::TRANSFORM);
2160 animation->set_fill_mode(Animation::FillMode::NONE); 2165 animation->set_fill_mode(Animation::FillMode::NONE);
2161 animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000)); 2166 animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000));
2162 AddAnimationToElementWithPlayer(grand_child->element_id(), timeline_impl(), 2167 AddAnimationToElementWithPlayer(grand_child->element_id(), timeline_impl(),
2163 std::move(animation)); 2168 std::move(animation));
2164 ExecuteCalculateDrawProperties(root); 2169 ExecuteCalculateDrawProperties(root);
2165 2170
2166 EXPECT_FALSE(root->screen_space_transform_is_animating()); 2171 EXPECT_FALSE(root->screen_space_transform_is_animating());
2167 EXPECT_FALSE(child->screen_space_transform_is_animating()); 2172 EXPECT_FALSE(child->screen_space_transform_is_animating());
2168 2173
2169 EXPECT_FALSE(grand_child->TransformIsAnimating()); 2174 EXPECT_FALSE(TransformIsAnimating(grand_child));
2170 EXPECT_TRUE(grand_child->HasPotentiallyRunningTransformAnimation()); 2175 EXPECT_TRUE(grand_child->HasPotentiallyRunningTransformAnimation());
2171 EXPECT_TRUE(grand_child->screen_space_transform_is_animating()); 2176 EXPECT_TRUE(grand_child->screen_space_transform_is_animating());
2172 EXPECT_TRUE(great_grand_child->screen_space_transform_is_animating()); 2177 EXPECT_TRUE(great_grand_child->screen_space_transform_is_animating());
2173 } 2178 }
2174 2179
2175 TEST_F(LayerTreeHostCommonDrawRectsTest, DrawRectsForIdentityTransform) { 2180 TEST_F(LayerTreeHostCommonDrawRectsTest, DrawRectsForIdentityTransform) {
2176 // Test visible layer rect and drawable content rect are calculated correctly 2181 // Test visible layer rect and drawable content rect are calculated correctly
2177 // correctly for identity transforms. 2182 // correctly for identity transforms.
2178 2183
2179 gfx::Rect target_surface_rect = gfx::Rect(0, 0, 100, 100); 2184 gfx::Rect target_surface_rect = gfx::Rect(0, 0, 100, 100);
(...skipping 7939 matching lines...) Expand 10 before | Expand all | Expand 10 after
10119 10124
10120 // Check child layer draw properties. 10125 // Check child layer draw properties.
10121 EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect()); 10126 EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect());
10122 EXPECT_EQ(gfx::Transform(), child->DrawTransform()); 10127 EXPECT_EQ(gfx::Transform(), child->DrawTransform());
10123 EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect()); 10128 EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect());
10124 EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect()); 10129 EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect());
10125 } 10130 }
10126 10131
10127 } // namespace 10132 } // namespace
10128 } // namespace cc 10133 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698