cc: Include viewport clip in visible rect of unclipped surfaces

cc/trees/draw_property_utils.cc

 // Copyright 2014 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/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 450 matching lines @@
       // with respect to clip parent's local clip and not its combined clip as
       // the combined clip has even the clip parent's target's clip baked into
       // it and as our target is different, we don't want to use it in our
       // visible rect computation.
       if (!GetLayerClipRect(layer, clip_node, property_trees, target_node_id,
                             &combined_clip_rect_in_target_space)) {
         layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
         continue;
       }
     } else {
-      if (clip_node->target_is_clipped) {
-        combined_clip_rect_in_target_space =
-            clip_node->combined_clip_in_target_space;
-      } else {
-        combined_clip_rect_in_target_space = clip_node->clip_in_target_space;
-      }
+      combined_clip_rect_in_target_space =
+          clip_node->combined_clip_in_target_space;
     }
 
     // The clip rect should be intersected with layer rect in target space.
     gfx::Transform content_to_target = transform_tree.ToTarget(
         transform_node->id, layer->render_target_effect_tree_index());
     content_to_target.Translate(layer->offset_to_transform_parent().x(),
                                 layer->offset_to_transform_parent().y());
     gfx::Rect layer_content_rect = gfx::Rect(layer_bounds);
     gfx::RectF layer_content_bounds_in_target_space = MathUtil::MapClippedRect(
         content_to_target, gfx::RectF(layer_content_rect));
@@ skipping 1108 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc