Fix cc scrollbar layer issues with initialization, and use element ids throughout.

cc/trees/layer_tree_host_impl_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/layer_tree_host_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 3150 matching lines @@
     container->test_properties()->force_render_surface = true;
     container->SetBounds(gfx::Size(10, 10));
     host_impl_->pending_tree()->BuildPropertyTreesForTesting();
 
     LayerImpl* pending_scrollbar_layer =
         host_impl_->pending_tree()->LayerById(400);
     pending_scrollbar_layer->SetNeedsPushProperties();
     EffectNode* pending_tree_node =
         host_impl_->pending_tree()->property_trees()->effect_tree.Node(
             pending_scrollbar_layer->effect_tree_index());
-    host_impl_->pending_tree()
-        ->property_trees()
-        ->always_use_active_tree_opacity_effect_ids.push_back(400);
     if (expecting_animations) {
       EXPECT_FLOAT_EQ(1.f, active_tree_node->opacity);
       EXPECT_FLOAT_EQ(1.f, active_scrollbar_layer->Opacity());
     } else {
       EXPECT_FLOAT_EQ(0.f, active_tree_node->opacity);
       EXPECT_FLOAT_EQ(0.f, active_scrollbar_layer->Opacity());
     }
     EXPECT_FLOAT_EQ(0.f, pending_tree_node->opacity);
     host_impl_->ActivateSyncTree();
     active_tree_node =
@@ skipping 138 matching lines @@
   gfx::Size content_size(1000, 1000);
 
   const int vert_1_id = 10;
   const int horiz_1_id = 11;
   const int vert_2_id = 12;
   const int horiz_2_id = 13;
   const int child_clip_id = 14;
   const int child_scroll_id = 15;
 
   CreateScrollAndContentsLayers(host_impl_->active_tree(), content_size);
-  host_impl_->active_tree()->InnerViewportContainerLayer()->SetBounds(
-      viewport_size);
+  LayerImpl* container =
+      host_impl_->active_tree()->InnerViewportContainerLayer();
+  container->SetBounds(viewport_size);
   LayerImpl* root_scroll =
       host_impl_->active_tree()->OuterViewportScrollLayer();
-  std::unique_ptr<SolidColorScrollbarLayerImpl> vert_1_scrollbar =
-      SolidColorScrollbarLayerImpl::Create(host_impl_->active_tree(), vert_1_id,
-                                           VERTICAL, 5, 5, true, true);
-  std::unique_ptr<SolidColorScrollbarLayerImpl> horiz_1_scrollbar =
-      SolidColorScrollbarLayerImpl::Create(
-          host_impl_->active_tree(), horiz_1_id, HORIZONTAL, 5, 5, true, true);
-  std::unique_ptr<SolidColorScrollbarLayerImpl> vert_2_scrollbar =
-      SolidColorScrollbarLayerImpl::Create(host_impl_->active_tree(), vert_2_id,
-                                           VERTICAL, 5, 5, true, true);
-  std::unique_ptr<SolidColorScrollbarLayerImpl> horiz_2_scrollbar =
-      SolidColorScrollbarLayerImpl::Create(
-          host_impl_->active_tree(), horiz_2_id, HORIZONTAL, 5, 5, true, true);
+
+  container->test_properties()->AddChild(SolidColorScrollbarLayerImpl::Create(
+      host_impl_->active_tree(), vert_1_id, VERTICAL, 5, 5, true, true));
+  SolidColorScrollbarLayerImpl* vert_1_scrollbar =
+      static_cast<SolidColorScrollbarLayerImpl*>(
+          container->test_properties()->children[1]);
+
+  container->test_properties()->AddChild(SolidColorScrollbarLayerImpl::Create(
+      host_impl_->active_tree(), horiz_1_id, HORIZONTAL, 5, 5, true, true));
+  SolidColorScrollbarLayerImpl* horiz_1_scrollbar =
+      static_cast<SolidColorScrollbarLayerImpl*>(
+          container->test_properties()->children[2]);
+
+  container->test_properties()->AddChild(SolidColorScrollbarLayerImpl::Create(
+      host_impl_->active_tree(), vert_2_id, VERTICAL, 5, 5, true, true));
+  SolidColorScrollbarLayerImpl* vert_2_scrollbar =
+      static_cast<SolidColorScrollbarLayerImpl*>(
+          container->test_properties()->children[3]);
+
+  container->test_properties()->AddChild(SolidColorScrollbarLayerImpl::Create(
+      host_impl_->active_tree(), horiz_2_id, HORIZONTAL, 5, 5, true, true));
+  SolidColorScrollbarLayerImpl* horiz_2_scrollbar =
+      static_cast<SolidColorScrollbarLayerImpl*>(
+          container->test_properties()->children[4]);
+
   std::unique_ptr<LayerImpl> child =
       LayerImpl::Create(host_impl_->active_tree(), child_scroll_id);
   child->SetBounds(content_size);
   std::unique_ptr<LayerImpl> child_clip =
       LayerImpl::Create(host_impl_->active_tree(), child_clip_id);
   child->SetBounds(viewport_size);
   LayerImpl* child_ptr = child.get();
   LayerImpl* child_clip_ptr = child_clip.get();
 
+  host_impl_->active_tree()->BuildPropertyTreesForTesting();
+
   // Check scrollbar registration on the viewport layers.
   EXPECT_EQ(0ul, host_impl_->ScrollbarsFor(root_scroll->element_id()).size());
   EXPECT_EQ(nullptr, host_impl_->ScrollbarAnimationControllerForElementId(
                          root_scroll->element_id()));
   vert_1_scrollbar->SetScrollElementId(root_scroll->element_id());
   EXPECT_EQ(1ul, host_impl_->ScrollbarsFor(root_scroll->element_id()).size());
   EXPECT_TRUE(host_impl_->ScrollbarAnimationControllerForElementId(
       root_scroll->element_id()));
   horiz_1_scrollbar->SetScrollElementId(root_scroll->element_id());
   EXPECT_EQ(2ul, host_impl_->ScrollbarsFor(root_scroll->element_id()).size());
@@ skipping 29 matching lines @@
   // Changing one of the child layers should result in a scrollbar animation
   // update.
   animation_task_ = base::Closure();
   child_clip_ptr->SetBounds(gfx::Size(200, 200));
   child_ptr->set_needs_show_scrollbars(true);
   host_impl_->active_tree()->HandleScrollbarShowRequestsFromMain();
   EXPECT_FALSE(animation_task_.Equals(base::Closure()));
   animation_task_ = base::Closure();
 
   // Check scrollbar unregistration.
-  vert_1_scrollbar.reset();
+  container->test_properties()->RemoveChild(vert_1_scrollbar);
   EXPECT_EQ(1ul, host_impl_->ScrollbarsFor(root_scroll->element_id()).size());
   EXPECT_TRUE(host_impl_->ScrollbarAnimationControllerForElementId(
       root_scroll->element_id()));
-  horiz_1_scrollbar.reset();
+  container->test_properties()->RemoveChild(horiz_1_scrollbar);
   EXPECT_EQ(0ul, host_impl_->ScrollbarsFor(root_scroll->element_id()).size());
   EXPECT_EQ(nullptr, host_impl_->ScrollbarAnimationControllerForElementId(
                          root_scroll->element_id()));
 
   EXPECT_EQ(2ul, host_impl_->ScrollbarsFor(child_scroll_element_id).size());
-  vert_2_scrollbar.reset();
+  container->test_properties()->RemoveChild(vert_2_scrollbar);
   EXPECT_EQ(1ul, host_impl_->ScrollbarsFor(child_scroll_element_id).size());
   EXPECT_TRUE(host_impl_->ScrollbarAnimationControllerForElementId(
       child_scroll_element_id));
-  horiz_2_scrollbar.reset();
+  container->test_properties()->RemoveChild(horiz_2_scrollbar);
   EXPECT_EQ(0ul, host_impl_->ScrollbarsFor(child_scroll_element_id).size());
   EXPECT_EQ(nullptr, host_impl_->ScrollbarAnimationControllerForElementId(
                          root_scroll->element_id()));
 
   // Changing scroll offset should no longer trigger any animation.
   host_impl_->active_tree()->InnerViewportScrollLayer()->SetCurrentScrollOffset(
       gfx::ScrollOffset(20, 20));
   EXPECT_TRUE(animation_task_.Equals(base::Closure()));
   child_ptr->SetCurrentScrollOffset(gfx::ScrollOffset(20, 20));
   EXPECT_TRUE(animation_task_.Equals(base::Closure()));
@@ skipping 8939 matching lines @@
     else
       EXPECT_FALSE(tile->HasRasterTask());
   }
   Region expected_invalidation(
       raster_source->GetRectForImage(checkerable_image->uniqueID()));
   EXPECT_EQ(expected_invalidation, *(root->GetPendingInvalidation()));
 }
 
 }  // namespace
 }  // namespace cc