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

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

Issue 1479883002: cc: Fix draw transform computation for non-drawn layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove LayerImpl::draw_transform() Created 5 years 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
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.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 EXPECT_FLOAT_EQ(1.5f, child->MaximumTilingContentsScale()); 1693 EXPECT_FLOAT_EQ(1.5f, child->MaximumTilingContentsScale());
1694 1694
1695 gfx::Transform scale_transform; 1695 gfx::Transform scale_transform;
1696 scale_transform.Scale(impl->active_tree()->device_scale_factor(), 1696 scale_transform.Scale(impl->active_tree()->device_scale_factor(),
1697 impl->active_tree()->device_scale_factor()); 1697 impl->active_tree()->device_scale_factor());
1698 1698
1699 // The root layer is scaled by 2x. 1699 // The root layer is scaled by 2x.
1700 gfx::Transform root_screen_space_transform = scale_transform; 1700 gfx::Transform root_screen_space_transform = scale_transform;
1701 gfx::Transform root_draw_transform = scale_transform; 1701 gfx::Transform root_draw_transform = scale_transform;
1702 1702
1703 EXPECT_EQ(root_draw_transform, root->draw_transform()); 1703 EXPECT_EQ(root_draw_transform, root->DrawTransform());
1704 EXPECT_EQ(root_screen_space_transform, root->screen_space_transform()); 1704 EXPECT_EQ(root_screen_space_transform, root->screen_space_transform());
1705 1705
1706 // The child is at position 2,2, which is transformed to 3,3 after the scale 1706 // The child is at position 2,2, which is transformed to 3,3 after the scale
1707 gfx::Transform child_transform; 1707 gfx::Transform child_transform;
1708 child_transform.Translate(3.f, 3.f); 1708 child_transform.Translate(3.f, 3.f);
1709 child_transform.Scale(child->MaximumTilingContentsScale(), 1709 child_transform.Scale(child->MaximumTilingContentsScale(),
1710 child->MaximumTilingContentsScale()); 1710 child->MaximumTilingContentsScale());
1711 1711
1712 EXPECT_TRANSFORMATION_MATRIX_EQ(child_transform, child->draw_transform()); 1712 EXPECT_TRANSFORMATION_MATRIX_EQ(child_transform, child->DrawTransform());
1713 EXPECT_TRANSFORMATION_MATRIX_EQ(child_transform, 1713 EXPECT_TRANSFORMATION_MATRIX_EQ(child_transform,
1714 child->screen_space_transform()); 1714 child->screen_space_transform());
1715 1715
1716 EndTest(); 1716 EndTest();
1717 } 1717 }
1718 1718
1719 void AfterTest() override {} 1719 void AfterTest() override {}
1720 1720
1721 private: 1721 private:
1722 FakeContentLayerClient client_; 1722 FakeContentLayerClient client_;
(...skipping 4725 matching lines...) Expand 10 before | Expand all | Expand 10 after
6448 EndTest(); 6448 EndTest();
6449 } 6449 }
6450 6450
6451 void AfterTest() override {} 6451 void AfterTest() override {}
6452 }; 6452 };
6453 6453
6454 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor); 6454 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
6455 6455
6456 } // namespace 6456 } // namespace
6457 } // namespace cc 6457 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698