cc : Stop pushing properties not used by LayerImpl to LayerImpl (4)

cc/trees/tree_synchronizer_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/tree_synchronizer.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 91 matching lines @@
     SCOPED_TRACE("replica_layer");
     ExpectTreesAreIdentical(layer->replica_layer(), layer_impl->replica_layer(),
                             tree_impl);
   }
 
   const LayerList& layer_children = layer->children();
   const LayerImplList& layer_impl_children = layer_impl->children();
 
   ASSERT_EQ(layer_children.size(), layer_impl_children.size());
 
-  const std::set<Layer*>* layer_scroll_children = layer->scroll_children();
-  const std::set<LayerImpl*>* layer_impl_scroll_children =
-      layer_impl->scroll_children();
+  const Layer* layer_scroll_parent = layer->scroll_parent();
 
-  ASSERT_EQ(!!layer_scroll_children, !!layer_impl_scroll_children);
-
-  if (layer_scroll_children) {
-    ASSERT_EQ(layer_scroll_children->size(),
-              layer_impl_scroll_children->size());
+  if (layer_scroll_parent) {
+    ASSERT_TRUE(layer_scroll_parent->scroll_children()->find(layer) !=
+                layer_scroll_parent->scroll_children()->end());
   }
 
-  const Layer* layer_scroll_parent = layer->scroll_parent();
-  const LayerImpl* layer_impl_scroll_parent = layer_impl->scroll_parent();
-
-  ASSERT_EQ(!!layer_scroll_parent, !!layer_impl_scroll_parent);
-
-  if (layer_scroll_parent) {
-    ASSERT_EQ(layer_scroll_parent->id(), layer_impl_scroll_parent->id());
-    ASSERT_TRUE(layer_scroll_parent->scroll_children()->find(layer) !=
-                layer_scroll_parent->scroll_children()->end());
-    ASSERT_TRUE(layer_impl_scroll_parent->scroll_children()->find(layer_impl) !=
-                layer_impl_scroll_parent->scroll_children()->end());
-  }
-
-  const std::set<Layer*>* layer_clip_children = layer->clip_children();
-  const std::set<LayerImpl*>* layer_impl_clip_children =
-      layer_impl->clip_children();
-
-  ASSERT_EQ(!!layer_clip_children, !!layer_impl_clip_children);
-
-  if (layer_clip_children)
-    ASSERT_EQ(layer_clip_children->size(), layer_impl_clip_children->size());
-
   const Layer* layer_clip_parent = layer->clip_parent();
-  const LayerImpl* layer_impl_clip_parent = layer_impl->clip_parent();
-
-  ASSERT_EQ(!!layer_clip_parent, !!layer_impl_clip_parent);
 
   if (layer_clip_parent) {
-    const std::set<LayerImpl*>* clip_children_impl =
-        layer_impl_clip_parent->clip_children();
     const std::set<Layer*>* clip_children = layer_clip_parent->clip_children();
-    ASSERT_EQ(layer_clip_parent->id(), layer_impl_clip_parent->id());
     ASSERT_TRUE(clip_children->find(layer) != clip_children->end());
-    ASSERT_TRUE(clip_children_impl->find(layer_impl) !=
-                clip_children_impl->end());
   }
 
   for (size_t i = 0; i < layer_children.size(); ++i) {
     SCOPED_TRACE(base::StringPrintf("child layer %" PRIuS, i).c_str());
     ExpectTreesAreIdentical(layer_children[i].get(), layer_impl_children[i],
                             tree_impl);
   }
 }
 
 class TreeSynchronizerTest : public testing::Test {
@@ skipping 355 matching lines @@
   replica_layer_with_mask->SetMaskLayer(NULL);
   TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                      host_->active_tree());
   layer_impl_tree_root = host_->active_tree()->root_layer();
   ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
                           host_->active_tree());
 
   host_->active_tree()->ClearLayers();
 }
 
-TEST_F(TreeSynchronizerTest, SynchronizeScrollParent) {
-  LayerTreeSettings settings;
-  FakeImplTaskRunnerProvider task_runner_provider;
-  FakeRenderingStatsInstrumentation stats_instrumentation;
-  FakeLayerTreeHostImplClient impl_client;
-  TestSharedBitmapManager shared_bitmap_manager;
-  TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
-      settings, &impl_client, &task_runner_provider, &stats_instrumentation,
-      &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
-
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  scoped_refptr<Layer> scroll_parent = Layer::Create();
-  layer_tree_root->AddChild(scroll_parent);
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
-
-  host_->SetRootLayer(layer_tree_root);
-
-  // First child is the second and third child's scroll parent.
-  layer_tree_root->children()[1]->SetScrollParent(scroll_parent.get());
-  layer_tree_root->children()[2]->SetScrollParent(scroll_parent.get());
-
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  LayerImpl* layer_impl_tree_root = host_impl->active_tree()->root_layer();
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  {
-    SCOPED_TRACE("case one");
-    ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                            host_impl->active_tree());
-  }
-
-  // Remove the first scroll child.
-  layer_tree_root->children()[1]->RemoveFromParent();
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  {
-    SCOPED_TRACE("case two");
-    ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                            host_impl->active_tree());
-  }
-
-  // Add an additional scroll layer.
-  scoped_refptr<Layer> additional_scroll_child = Layer::Create();
-  layer_tree_root->AddChild(additional_scroll_child);
-  additional_scroll_child->SetScrollParent(scroll_parent.get());
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  {
-    SCOPED_TRACE("case three");
-    ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                            host_impl->active_tree());
-  }
-}
-
-TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
-  LayerTreeSettings settings;
-  FakeImplTaskRunnerProvider task_runner_provider;
-  FakeRenderingStatsInstrumentation stats_instrumentation;
-  FakeLayerTreeHostImplClient impl_client;
-  TestSharedBitmapManager shared_bitmap_manager;
-  TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<LayerTreeHostImpl> host_impl = LayerTreeHostImpl::Create(
-      settings, &impl_client, &task_runner_provider, &stats_instrumentation,
-      &shared_bitmap_manager, nullptr, &task_graph_runner, 0);
-
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  scoped_refptr<Layer> clip_parent = Layer::Create();
-  scoped_refptr<Layer> intervening = Layer::Create();
-  scoped_refptr<Layer> clip_child1 = Layer::Create();
-  scoped_refptr<Layer> clip_child2 = Layer::Create();
-  layer_tree_root->AddChild(clip_parent);
-  clip_parent->AddChild(intervening);
-  intervening->AddChild(clip_child1);
-  intervening->AddChild(clip_child2);
-
-  host_->SetRootLayer(layer_tree_root);
-
-  // First child is the second and third child's scroll parent.
-  clip_child1->SetClipParent(clip_parent.get());
-  clip_child2->SetClipParent(clip_parent.get());
-
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  LayerImpl* layer_impl_tree_root = host_impl->active_tree()->root_layer();
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                          host_impl->active_tree());
-
-  // Remove the first clip child.
-  clip_child1->RemoveFromParent();
-  clip_child1 = NULL;
-
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                          host_impl->active_tree());
-
-  // Add an additional clip child.
-  scoped_refptr<Layer> additional_clip_child = Layer::Create();
-  intervening->AddChild(additional_clip_child);
-  additional_clip_child->SetClipParent(clip_parent.get());
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                          host_impl->active_tree());
-
-  // Remove the nearest clipping ancestor.
-  clip_parent->RemoveFromParent();
-  clip_parent = NULL;
-  TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
-                                     host_impl->active_tree());
-  TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(),
-                                        host_impl->active_tree());
-  ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root,
-                          host_impl->active_tree());
-
-  // The clip children should have been unhooked.
-  EXPECT_EQ(2u, intervening->children().size());
-  EXPECT_FALSE(clip_child2->clip_parent());
-  EXPECT_FALSE(additional_clip_child->clip_parent());
-}
-
 TEST_F(TreeSynchronizerTest, SynchronizeCurrentlyScrollingNode) {
   LayerTreeSettings settings;
   FakeLayerTreeHostImplClient client;
   FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
   FakeLayerTreeHostImpl* host_impl = host_->host_impl();
   host_impl->CreatePendingTree();
 
@@ skipping 124 matching lines @@
   scroll_offset_map[scroll_layer->id()]->PullDeltaForMainThread();
   scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(40, 50));
   scroll_offset_map[scroll_layer->id()]->PushFromMainThread(
       gfx::ScrollOffset(100, 100));
   scroll_offset_map[scroll_layer->id()]->PushPendingToActive();
   EXPECT_TRUE(is_equal(scroll_offset_map, scroll_tree.scroll_offset_map()));
 }
 
 }  // namespace
 }  // namespace cc