cc: Don't create SyncedPropety instances on the main thread.

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 14 matching lines @@
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "cc/trees/task_runner_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
+bool AreScrollOffsetsEqual(const SyncedScrollOffset* a,
+                           const SyncedScrollOffset* b) {
+  return a->ActiveBase() == b->ActiveBase() &&
+         a->PendingBase() == b->PendingBase() && a->Delta() == b->Delta() &&
+         a->PendingDelta().get() == b->PendingDelta().get();
+}
+
 class MockLayerImpl : public LayerImpl {
  public:
   static std::unique_ptr<MockLayerImpl> Create(LayerTreeImpl* tree_impl,
                                                int layer_id) {
     return base::WrapUnique(new MockLayerImpl(tree_impl, layer_id));
   }
   ~MockLayerImpl() override {
     if (layer_impl_destruction_list_)
       layer_impl_destruction_list_->push_back(id());
   }
@@ skipping 82 matching lines @@
 }
 
 class TreeSynchronizerTest : public testing::Test {
  protected:
   TreeSynchronizerTest()
       : animation_host_(AnimationHost::CreateForTesting(ThreadInstance::MAIN)),
         host_(FakeLayerTreeHost::Create(&client_,
                                         &task_graph_runner_,
                                         animation_host_.get())) {}
 
-  bool is_equal(ScrollTree::ScrollOffsetMap map,
-                ScrollTree::ScrollOffsetMap other) {
-    if (map.size() != other.size())
-      return false;
-    for (auto& map_entry : map) {
-      if (other.find(map_entry.first) == other.end())
-        return false;
-      SyncedScrollOffset& from_map = *map_entry.second.get();
-      SyncedScrollOffset& from_other = *other[map_entry.first].get();
-      if (from_map.PendingBase() != from_other.PendingBase() ||
-          from_map.ActiveBase() != from_other.ActiveBase() ||
-          from_map.Delta() != from_other.Delta() ||
-          from_map.PendingDelta().get() != from_other.PendingDelta().get())
-        return false;
-    }
-    return true;
-  }
-
   FakeLayerTreeHostClient client_;
   StubLayerTreeHostSingleThreadClient single_thread_client_;
   TestTaskGraphRunner task_graph_runner_;
   std::unique_ptr<AnimationHost> animation_host_;
   std::unique_ptr<FakeLayerTreeHost> host_;
 };
 
 // Attempts to synchronizes a null tree. This should not crash, and should
 // return a null tree.
 TEST_F(TreeSynchronizerTest, SyncNullTree) {
@@ skipping 396 matching lines @@
   host_->CommitAndCreatePendingTree();
   host_impl->ActivateSyncTree();
 
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           host_impl->active_tree()->root_layer_for_testing(),
                           host_impl->active_tree());
 
   // After the initial commit, scroll_offset_map in scroll_tree is expected to
   // have one entry for scroll_layer and one entry for transient_scroll_layer,
   // the pending base and active base must be the same at this stage.
-  ScrollTree::ScrollOffsetMap scroll_offset_map;
-  scroll_offset_map[scroll_layer->id()] = new SyncedScrollOffset;
-  scroll_offset_map[transient_scroll_layer->id()] = new SyncedScrollOffset;
-  scroll_offset_map[scroll_layer->id()]->PushFromMainThread(
-      scroll_layer->scroll_offset());
-  scroll_offset_map[scroll_layer->id()]->PushPendingToActive();
-  scroll_offset_map[transient_scroll_layer->id()]->PushFromMainThread(
+  scoped_refptr<SyncedScrollOffset> scroll_layer_offset =
+      new SyncedScrollOffset;
+  scroll_layer_offset->PushFromMainThread(scroll_layer->scroll_offset());
+  scroll_layer_offset->PushPendingToActive();
+  EXPECT_TRUE(AreScrollOffsetsEqual(
+      scroll_layer_offset.get(),
+      host_impl->active_tree()
+          ->property_trees()
+          ->scroll_tree.GetSyncedScrollOffset(scroll_layer->id())));
+
+  scoped_refptr<SyncedScrollOffset> transient_scroll_layer_offset =
+      new SyncedScrollOffset;
+  transient_scroll_layer_offset->PushFromMainThread(
       transient_scroll_layer->scroll_offset());
-  scroll_offset_map[transient_scroll_layer->id()]->PushPendingToActive();
-  EXPECT_TRUE(
-      is_equal(scroll_offset_map, host_impl->active_tree()
-                                      ->property_trees()
-                                      ->scroll_tree.scroll_offset_map()));
+  transient_scroll_layer_offset->PushPendingToActive();
+  EXPECT_TRUE(AreScrollOffsetsEqual(
+      transient_scroll_layer_offset.get(),
+      host_impl->active_tree()
+          ->property_trees()
+          ->scroll_tree.GetSyncedScrollOffset(transient_scroll_layer->id())));
 
   // Set ScrollOffset active delta: gfx::ScrollOffset(10, 10)
   LayerImpl* scroll_layer_impl =
       host_impl->active_tree()->LayerById(scroll_layer->id());
   ScrollTree& scroll_tree =
       host_impl->active_tree()->property_trees()->scroll_tree;
   scroll_tree.SetScrollOffset(scroll_layer_impl->id(),
                               gfx::ScrollOffset(20, 30));
 
   // Pull ScrollOffset delta for main thread, and change offset on main thread
@@ skipping 12 matching lines @@
   // Make one layer unscrollable so that scroll tree topology changes
   transient_scroll_layer->SetScrollClipLayerId(Layer::INVALID_ID);
   host_->BuildPropertyTreesForTesting();
 
   host_impl->CreatePendingTree();
   host_->CommitAndCreatePendingTree();
   host_impl->ActivateSyncTree();
 
   EXPECT_EQ(scroll_layer->id(),
             host_impl->active_tree()->CurrentlyScrollingLayer()->id());
-  scroll_offset_map.erase(transient_scroll_layer->id());
-  scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(20, 30));
-  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()));
+  scroll_layer_offset->SetCurrent(gfx::ScrollOffset(20, 30));
+  scroll_layer_offset->PullDeltaForMainThread();
+  scroll_layer_offset->SetCurrent(gfx::ScrollOffset(40, 50));
+  scroll_layer_offset->PushFromMainThread(gfx::ScrollOffset(100, 100));
+  scroll_layer_offset->PushPendingToActive();
+  EXPECT_TRUE(AreScrollOffsetsEqual(
+      scroll_layer_offset.get(),
+      host_impl->active_tree()
+          ->property_trees()
+          ->scroll_tree.GetSyncedScrollOffset(scroll_layer->id())));
+  EXPECT_EQ(nullptr, host_impl->active_tree()
+                         ->property_trees()
+                         ->scroll_tree.GetSyncedScrollOffset(
+                             transient_scroll_layer->id()));
 }
 
 TEST_F(TreeSynchronizerTest, RefreshPropertyTreesCachedData) {
   host_->InitializeSingleThreaded(&single_thread_client_,
                                   base::ThreadTaskRunnerHandle::Get());
   LayerTreeSettings settings;
   FakeLayerTreeHostImplClient client;
   FakeImplTaskRunnerProvider task_runner_provider;
   FakeRenderingStatsInstrumentation stats_instrumentation;
   TestTaskGraphRunner task_graph_runner;
@@ skipping 29 matching lines @@
   host_->CommitAndCreatePendingTree();
   host_impl->ActivateSyncTree();
   EXPECT_EQ(
       CombinedAnimationScale(0.f, 0.f),
       host_impl->active_tree()->property_trees()->GetAnimationScales(
           transform_layer->transform_tree_index(), host_impl->active_tree()));
 }
 
 }  // namespace
 }  // namespace cc