cc: Don't consider padding 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 <algorithm>
 #include <limits>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
@@ skipping 228 matching lines @@
 
   return picture;
 }
 
 void PicturePileImpl::AnalyzeInRect(gfx::Rect content_rect,
                                     float contents_scale,
                                     PicturePileImpl::Analysis* analysis) {
   DCHECK(analysis);
   TRACE_EVENT0("cc", "PicturePileImpl::AnalyzeInRect");
 
-  content_rect.Intersect(gfx::Rect(gfx::ToCeiledSize(
-      gfx::ScaleSize(tiling_.total_size(), contents_scale))));
+  gfx::Rect layer_rect = gfx::ToEnclosingRect(

[enne (OOO), 2013/05/13 17:48:52]

layer_rect is tiling_.total_size().  No need for scaling.

+      gfx::ScaleRect(content_rect, 1.0f / contents_scale));
+
+  layer_rect.Intersect(gfx::Rect(tiling_.total_size()));
 
   SkBitmap empty_bitmap;
   empty_bitmap.setConfig(SkBitmap::kNo_Config,
-                         content_rect.width(),
-                         content_rect.height());
+                         layer_rect.width(),
+                         layer_rect.height());
   skia::AnalysisDevice device(empty_bitmap);
   skia::AnalysisCanvas canvas(&device);
 
-  Raster(&canvas, content_rect, contents_scale, NULL);
+  Raster(&canvas, layer_rect, 1.0f, NULL);
 
   analysis->is_solid_color = canvas.getColorIfSolid(&analysis->solid_color);
   analysis->has_text = canvas.hasText();
 }
 
 PicturePileImpl::Analysis::Analysis()
     : is_solid_color(false),
       has_text(false) {
 }
 
@@ skipping 55 matching lines @@
           layer_rect_,
           *picture_list_iterator_);
       if (pixel_ref_iterator_)
         return;
     }
     ++tile_iterator_;
   } while (AdvanceToTileWithPictures());
 }
 
 }  // namespace cc