| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index abf80ff5c979ef7f01b3a2356b3fb2e8c5f8c466..436191f81cc7dd50547de5baf7032ace197df505 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -226,8 +226,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| // Changing these properties does not cause the layer to be marked as changed
|
| // but does cause the layer to need to push properties.
|
| EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetIsRootForIsolatedGroup(true));
|
| - EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
|
| root->SetElementId(2));
|
| EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
|
| root->SetMutableProperties(MutableProperty::kOpacity));
|
| @@ -239,16 +237,12 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| root->SetClipParent(clip_parent.get()));
|
| EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
|
| root->SetClipChildren(clip_children));
|
| - EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetNumDescendantsThatDrawContent(10));
|
|
|
| // After setting all these properties already, setting to the exact same
|
| // values again should not cause any change.
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetMasksToBounds(true));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| root->SetPosition(arbitrary_point_f));
|
| - EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetShouldFlattenTransform(false));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->Set3dSortingContextId(1));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| root->SetTransform(arbitrary_transform));
|
| @@ -256,8 +250,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetOpacity(arbitrary_number));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| root->SetBlendMode(arbitrary_blend_mode));
|
| - EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetIsRootForIsolatedGroup(true));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetDrawsContent(true));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetBounds(bounds_size));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| @@ -364,8 +356,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| layer->NoteLayerPropertyChanged());
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer2->SetPosition(arbitrary_point_f);
|
| layer->NoteLayerPropertyChanged());
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetShouldFlattenTransform(false);
|
| - layer->NoteLayerPropertyChanged());
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1);
|
| layer->NoteLayerPropertyChanged());
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| @@ -382,8 +372,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| layer->NoteLayerPropertyChanged());
|
|
|
| // Unrelated functions, set to the same values, no needs update.
|
| - VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - layer->SetIsRootForIsolatedGroup(true));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetFilters(arbitrary_filters));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetMasksToBounds(true));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetContentsOpaque(true));
|
| @@ -399,8 +387,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetBlendMode(arbitrary_blend_mode));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - layer->SetIsRootForIsolatedGroup(true));
|
| - VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetTransform(arbitrary_transform));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(arbitrary_size));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetElementId(2));
|
| @@ -447,39 +433,6 @@ TEST(LayerImplTest, SafeOpaqueBackgroundColor) {
|
| }
|
| }
|
|
|
| -TEST(LayerImplTest, TransformInvertibility) {
|
| - FakeImplTaskRunnerProvider task_runner_provider;
|
| - TestSharedBitmapManager shared_bitmap_manager;
|
| - TestTaskGraphRunner task_graph_runner;
|
| - FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
|
| - &task_graph_runner);
|
| -
|
| - std::unique_ptr<LayerImpl> layer =
|
| - LayerImpl::Create(host_impl.active_tree(), 1);
|
| - EXPECT_TRUE(layer->transform().IsInvertible());
|
| - EXPECT_TRUE(layer->transform_is_invertible());
|
| -
|
| - gfx::Transform transform;
|
| - transform.Scale3d(
|
| - SkDoubleToMScalar(1.0), SkDoubleToMScalar(1.0), SkDoubleToMScalar(0.0));
|
| - layer->SetTransform(transform);
|
| - EXPECT_FALSE(layer->transform().IsInvertible());
|
| - EXPECT_FALSE(layer->transform_is_invertible());
|
| -
|
| - transform.MakeIdentity();
|
| - transform.ApplyPerspectiveDepth(SkDoubleToMScalar(100.0));
|
| - transform.RotateAboutZAxis(75.0);
|
| - transform.RotateAboutXAxis(32.2);
|
| - transform.RotateAboutZAxis(-75.0);
|
| - transform.Translate3d(SkDoubleToMScalar(50.5),
|
| - SkDoubleToMScalar(42.42),
|
| - SkDoubleToMScalar(-100.25));
|
| -
|
| - layer->SetTransform(transform);
|
| - EXPECT_TRUE(layer->transform().IsInvertible());
|
| - EXPECT_TRUE(layer->transform_is_invertible());
|
| -}
|
| -
|
| class LayerImplScrollTest : public testing::Test {
|
| public:
|
| LayerImplScrollTest()
|
|
|