cc: Add mask and replica layer ids to the effect tree

cc/trees/layer_tree_host_common.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_
 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
 
 #include <stddef.h>
 
 #include <limits>
@@ skipping 141 matching lines @@
   std::vector<std::unique_ptr<SwapPromise>> swap_promises;
 
   bool EqualsForTesting(const ScrollAndScaleSet& other) const;
   void ToProtobuf(proto::ScrollAndScaleSet* proto) const;
   void FromProtobuf(const proto::ScrollAndScaleSet& proto);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScrollAndScaleSet);
 };
 
-template <typename LayerType, typename Function>
-static void CallFunctionForLayer(LayerType* layer, const Function& function) {
-  function(layer);
-
-  if (LayerType* mask_layer = layer->mask_layer())
-    function(mask_layer);
-  if (LayerType* replica_layer = layer->replica_layer()) {
-    function(replica_layer);
-    if (LayerType* mask_layer = replica_layer->mask_layer())
+template <typename Function>
+void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeHost* host,
+                                                    const Function& function) {
+  for (auto* layer : *host) {
+    function(layer);
+    if (Layer* mask_layer = layer->mask_layer())
       function(mask_layer);
+    if (Layer* replica_layer = layer->replica_layer()) {
+      function(replica_layer);
+      if (Layer* mask_layer = replica_layer->mask_layer())
+        function(mask_layer);
+    }
   }
 }
 
 template <typename Function>
-void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeHost* host,
+void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeImpl* tree_impl,
                                                     const Function& function) {
-  for (auto* layer : *host)
-    CallFunctionForLayer(layer, function);
-}
+  for (auto* layer : *tree_impl)
+    function(layer);
 
-template <typename Function>
-void LayerTreeHostCommon::CallFunctionForEveryLayer(LayerTreeImpl* host_impl,
-                                                    const Function& function) {
-  for (auto* layer : *host_impl)
-    CallFunctionForLayer(layer, function);
+  for (int id :
+       tree_impl->property_trees()->effect_tree.mask_replica_layer_ids()) {
+    function(tree_impl->LayerById(id));
+  }
 }
 
 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer);
 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer);
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_