Update from https://crrev.com/320931

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 <limits>
 #include <vector>
 
@@ skipping 154 matching lines @@
   ScopedPtrVector<SwapPromise> swap_promises;
 };
 
 template <typename LayerType>
 bool LayerTreeHostCommon::RenderSurfaceContributesToTarget(
     LayerType* layer,
     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
+  //  (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_surface() && layer->id() != target_surface_layer_id;
+  return layer->render_target() == layer &&
+         layer->id() != target_surface_layer_id;
 }
 
 template <typename LayerType>
 LayerType* LayerTreeHostCommon::FindLayerInSubtree(LayerType* root_layer,
                                                    int layer_id) {
   if (!root_layer)
     return NULL;
 
   if (root_layer->id() == layer_id)
     return root_layer;
@@ skipping 85 matching lines @@
           true,
           render_surface_layer_list,
           0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_