| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index 1a65acb4e91bd02cecbc072b869d8b4afa296e9c..5b8af7e4ca7a0ffc8e476170a663710cdd173b72 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -156,7 +156,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| arbitrary_transform.Scale3d(0.1f, 0.2f, 0.3f);
|
| FilterOperations arbitrary_filters;
|
| arbitrary_filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
|
| - SkXfermode::Mode arbitrary_blend_mode = SkXfermode::kMultiply_Mode;
|
|
|
| // These properties are internal, and should not be considered "change" when
|
| // they are used.
|
| @@ -215,8 +214,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| root->SetTransform(arbitrary_transform));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentsOpaque(true));
|
| - EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetBlendMode(arbitrary_blend_mode));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetDrawsContent(true));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetBounds(bounds_size));
|
| }
|
| @@ -257,7 +254,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| arbitrary_transform.Scale3d(0.1f, 0.2f, 0.3f);
|
| FilterOperations arbitrary_filters;
|
| arbitrary_filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
|
| - SkXfermode::Mode arbitrary_blend_mode = SkXfermode::kMultiply_Mode;
|
|
|
| // Set layer to draw content so that their draw property by property trees is
|
| // verified.
|
| @@ -313,8 +309,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| layer->SetBackgroundColor(arbitrary_color));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->OnOpacityAnimated(arbitrary_number));
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBlendMode(arbitrary_blend_mode);
|
| - layer->NoteLayerPropertyChanged());
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->OnTransformAnimated(arbitrary_transform));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(arbitrary_size);
|
| @@ -334,8 +328,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetBackgroundColor(arbitrary_color));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - layer->SetBlendMode(arbitrary_blend_mode));
|
| - 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(ElementId(2, 0)));
|
|
|