summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2014-12-01 18:46:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-01 18:46:14 +0000
commit2e7495267cd2641ae800832c9996637794c948cc (patch)
tree3a587fb97e867aa2cc7848d06c7ffd309cb7a5c4
parent878de556fd9069b73122eb5d6155afc6b89112ce (diff)
parentc85651751be2767cc35d98d6dc516a5d99c3038f (diff)
downloadchromium_org-2e7495267cd2641ae800832c9996637794c948cc.tar.gz
Merge "Fork: Clip a layer when its render target's render surface is clipped." into m39
-rw-r--r--cc/trees/layer_tree_host_common.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 227c5874bf..1ea340705d 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -392,7 +392,7 @@ static gfx::Rect CalculateVisibleContentRect(
gfx::Rect visible_rect_in_target_surface_space =
layer->drawable_content_rect();
- if (!layer->render_target()->render_surface()->clip_rect().IsEmpty()) {
+ if (layer->render_target()->render_surface()->is_clipped()) {
// The |layer| L has a target T which owns a surface Ts. The surface Ts
// has a target TsT.
//