cc: Move RenderTarget Information to 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 189 matching lines @@
     int target_surface_layer_id) {
   // A layer will either contribute its own content, or its render surface's
   // content, to the target surface. The layer contributes its surface's content
   // when both the following are true:
   //  (1) The layer actually has a render surface and rendering into that
   //      surface, and
   //  (2) The layer's render surface is not the same as the target surface.
   //
   // Otherwise, the layer just contributes itself to the target surface.
 
-  return layer->render_target() == layer &&
+  return layer->has_render_surface() &&
+         layer->render_target() == layer->render_surface() &&
          layer->id() != target_surface_layer_id;
 }
 
 template <typename LayerType, typename Function>
 static void CallFunctionForLayer(LayerType* layer,
                                  const Function& function,
                                  const CallFunctionLayerType& type) {
   function(layer);
 
   LayerType* mask_layer = layer->mask_layer();
@@ skipping 37 matching lines @@
   for (auto* layer : *host_impl)
     CallFunctionForLayer(layer, function, type);
 }
 
 CC_EXPORT PropertyTrees* GetPropertyTrees(Layer* layer);
 CC_EXPORT PropertyTrees* GetPropertyTrees(LayerImpl* layer);
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_