| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index 858d8dbf4b9943a745dc4866e8100b5cae593acf..abf80ff5c979ef7f01b3a2356b3fb2e8c5f8c466 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -141,7 +141,7 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| std::set<LayerImpl*>* scroll_children = new std::set<LayerImpl*>();
|
| scroll_children->insert(scroll_child);
|
| scroll_children->insert(root);
|
| - root->SetForceRenderSurface(true);
|
| + root->test_properties()->force_render_surface = true;
|
|
|
| std::unique_ptr<LayerImpl> clip_parent =
|
| LayerImpl::Create(host_impl.active_tree(), 5);
|
| @@ -252,8 +252,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->Set3dSortingContextId(1));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| root->SetTransform(arbitrary_transform));
|
| - EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| - root->SetDoubleSided(false)); // constructor initializes it to "true".
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetContentsOpaque(true));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->SetOpacity(arbitrary_number));
|
| EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(
|
| @@ -325,11 +323,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| // filters.
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetHasRenderSurface(true));
|
|
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetForceRenderSurface(true));
|
| - VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetForceRenderSurface(true));
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetForceRenderSurface(false));
|
| - VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetForceRenderSurface(false));
|
| -
|
| // Related filter functions.
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| root->OnFilterAnimated(arbitrary_filters));
|
| @@ -376,9 +369,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1);
|
| layer->NoteLayerPropertyChanged());
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - layer->SetDoubleSided(false); // constructor initializes it to "true".
|
| - layer->NoteLayerPropertyChanged());
|
| - VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetBackgroundColor(arbitrary_color));
|
| VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetBackgroundFilters(arbitrary_filters));
|
| @@ -400,8 +390,6 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer2->SetPosition(arbitrary_point_f));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1));
|
| - VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| - layer->SetDoubleSided(false)); // constructor initializes it to "true".
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetDrawsContent(true));
|
| VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
|
| layer->SetBackgroundColor(arbitrary_color));
|
|
|