Remove owning_id from EffectNode and replace it by an opaque stable_id

cc/layers/effect_tree_layer_list_iterator_unittest.cc

 // Copyright 2017 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/layers/effect_tree_layer_list_iterator.h"
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
@@ skipping 127 matching lines @@
 
   host_impl_.active_tree()->SetRootLayerForTesting(std::move(root_layer));
 
   RenderSurfaceList render_surface_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_list);
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack();
   EXPECT_COUNT(root_ptr, 5, -1, 4);
-  EXPECT_COUNT(first_ptr, -1, -1, 3);
-  EXPECT_COUNT(second_ptr, -1, -1, 2);
-  EXPECT_COUNT(third_ptr, -1, -1, 1);
-  EXPECT_COUNT(fourth_ptr, -1, -1, 0);
+  EXPECT_COUNT(first_ptr, 5, -1, 3);
+  EXPECT_COUNT(second_ptr, 5, -1, 2);
+  EXPECT_COUNT(third_ptr, 5, -1, 1);
+  EXPECT_COUNT(fourth_ptr, 5, -1, 0);
 }
 
 TEST_F(EffectTreeLayerListIteratorTest, ComplexTree) {
   std::unique_ptr<TestLayerImpl> root_layer = CreateLayer();
   std::unique_ptr<TestLayerImpl> root1 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root2 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root3 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root21 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root22 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root23 = CreateLayer();
@@ skipping 21 matching lines @@
 
   host_impl_.active_tree()->SetRootLayerForTesting(std::move(root_layer));
 
   RenderSurfaceList render_surface_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_list);
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack();
   EXPECT_COUNT(root_ptr, 9, -1, 8);
-  EXPECT_COUNT(root1_ptr, -1, -1, 7);
-  EXPECT_COUNT(root2_ptr, -1, -1, 6);
-  EXPECT_COUNT(root21_ptr, -1, -1, 5);
-  EXPECT_COUNT(root22_ptr, -1, -1, 4);
-  EXPECT_COUNT(root221_ptr, -1, -1, 3);
-  EXPECT_COUNT(root23_ptr, -1, -1, 2);
-  EXPECT_COUNT(root231_ptr, -1, -1, 1);
-  EXPECT_COUNT(root3_ptr, -1, -1, 0);
+  EXPECT_COUNT(root1_ptr, 9, -1, 7);
+  EXPECT_COUNT(root2_ptr, 9, -1, 6);
+  EXPECT_COUNT(root21_ptr, 9, -1, 5);
+  EXPECT_COUNT(root22_ptr, 9, -1, 4);
+  EXPECT_COUNT(root221_ptr, 9, -1, 3);
+  EXPECT_COUNT(root23_ptr, 9, -1, 2);
+  EXPECT_COUNT(root231_ptr, 9, -1, 1);
+  EXPECT_COUNT(root3_ptr, 9, -1, 0);
 }
 
 TEST_F(EffectTreeLayerListIteratorTest, ComplexTreeMultiSurface) {
   std::unique_ptr<TestLayerImpl> root_layer = CreateLayer();
   std::unique_ptr<TestLayerImpl> root1 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root2 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root3 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root21 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root22 = CreateLayer();
   std::unique_ptr<TestLayerImpl> root23 = CreateLayer();
@@ skipping 25 matching lines @@
 
   host_impl_.active_tree()->SetRootLayerForTesting(std::move(root_layer));
 
   RenderSurfaceList render_surface_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root_ptr, root_ptr->bounds(), &render_surface_list);
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   IterateFrontToBack();
   EXPECT_COUNT(root_ptr, 14, -1, 13);
-  EXPECT_COUNT(root1_ptr, -1, -1, 12);
+  EXPECT_COUNT(root1_ptr, 14, -1, 12);
   EXPECT_COUNT(root2_ptr, 10, 11, -1);
-  EXPECT_COUNT(root21_ptr, -1, -1, 9);
+  EXPECT_COUNT(root21_ptr, 10, 11, 9);
   EXPECT_COUNT(root22_ptr, 7, 8, 6);
-  EXPECT_COUNT(root221_ptr, -1, -1, 5);
+  EXPECT_COUNT(root221_ptr, 7, 8, 5);
   EXPECT_COUNT(root23_ptr, 3, 4, 2);
-  EXPECT_COUNT(root231_ptr, -1, -1, 1);
-  EXPECT_COUNT(root3_ptr, -1, -1, 0);
+  EXPECT_COUNT(root231_ptr, 3, 4, 1);
+  EXPECT_COUNT(root3_ptr, 14, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc