| Index: trunk/src/cc/layers/layer_impl_unittest.cc
|
| ===================================================================
|
| --- trunk/src/cc/layers/layer_impl_unittest.cc (revision 191370)
|
| +++ trunk/src/cc/layers/layer_impl_unittest.cc (working copy)
|
| @@ -139,9 +139,8 @@
|
| EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
|
| root->SetContentsScale(arbitrary_number, arbitrary_number));
|
| EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetDrawsContent(true));
|
| + EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBackgroundColor(SK_ColorGRAY));
|
| EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
|
| - root->SetBackgroundColor(arbitrary_color));
|
| - EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
|
| root->SetBackgroundFilters(arbitrary_filters));
|
|
|
| // Changing these properties only affects how render surface is drawn
|
| @@ -262,9 +261,8 @@
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| root->SetContentsScale(arbitrary_number, arbitrary_number));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
|
| + VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetBackgroundColor(SK_ColorGRAY));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - root->SetBackgroundColor(arbitrary_color));
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| root->SetBackgroundFilters(arbitrary_filters));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitrary_number));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetTransform(arbitrary_transform));
|
| @@ -290,7 +288,7 @@
|
| root->SetContentsScale(arbitrary_number, arbitrary_number));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetDrawsContent(true));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - root->SetBackgroundColor(arbitrary_color));
|
| + root->SetBackgroundColor(SK_ColorGRAY));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| root->SetBackgroundFilters(arbitrary_filters));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetOpacity(arbitrary_number));
|
|
|