cc: Only consider layer clipped content rect for analysis

cc/resources/picture_pile_impl.cc

 // Copyright 2012 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 "base/debug/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/rendering_stats.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
@@ skipping 224 matching lines @@
       layer_rect.width(),
       layer_rect.height(),
       SkPicture::kUsePathBoundsForClip_RecordingFlag);
 
   Raster(canvas, layer_rect, 1.0);
   picture->endRecording();
 
   return picture;
 }
 
-void PicturePileImpl::AnalyzeInRect(const gfx::Rect& content_rect,
+void PicturePileImpl::AnalyzeInRect(gfx::Rect content_rect,
                                     float contents_scale,
                                     PicturePileImpl::Analysis* analysis) {
   DCHECK(analysis);
   TRACE_EVENT0("cc", "PicturePileImpl::AnalyzeInRect");
 
-  gfx::Rect layer_rect = gfx::ToEnclosingRect(
-      gfx::ScaleRect(content_rect, 1.f / contents_scale));
+  content_rect.Intersect(gfx::Rect(gfx::ToCeiledSize(
+      gfx::ScaleSize(tiling_.total_size(), contents_scale))));
 
   SkBitmap empty_bitmap;
-  empty_bitmap.setConfig(SkBitmap::kNo_Config, content_rect.width(),
-                        content_rect.height());
+  empty_bitmap.setConfig(SkBitmap::kNo_Config,
+                         content_rect.width(),
+                         content_rect.height());
   skia::AnalysisDevice device(empty_bitmap);
   skia::AnalysisCanvas canvas(&device);
 
   Raster(&canvas, content_rect, contents_scale);
 
   analysis->is_transparent = canvas.isTransparent();
   analysis->is_solid_color = canvas.getColorIfSolid(&analysis->solid_color);
   analysis->is_cheap_to_raster = canvas.isCheap();
   analysis->has_text = canvas.hasText();
   canvas.consumeLazyPixelRefs(&analysis->lazy_pixel_refs);
 }
 
 PicturePileImpl::Analysis::Analysis()
   : is_solid_color(false),
     is_transparent(false),
     has_text(false),
     is_cheap_to_raster(false) {
 }
 
 PicturePileImpl::Analysis::~Analysis() {
 }
 
 }  // namespace cc