cc: Don't consider padding for analysis.

cc/resources/tile_manager.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 "cc/resources/tile_manager.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/traced_value.h"
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
 #include "third_party/skia/include/core/SkDevice.h"
+#include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 
 namespace {
 
 // If we raster too fast we become upload bound, and pending
 // uploads consume memory. For maximum upload throughput, we would
 // want to allow for upload_throughput * pipeline_time of pending
 // uploads, after which we are just wasting memory. Since we don't
 // know our upload throughput yet, this just caps our memory usage.
@@ skipping 815 matching lines @@
 
   // Record the solid color prediction.
   UMA_HISTOGRAM_BOOLEAN("Renderer4.SolidColorTilesAnalyzed",
                         analysis->is_solid_color);
   stats_instrumentation->AddTileAnalysisResult(analysis->is_solid_color);
 
   // Clear the flag if we're not using the estimator.
   analysis->is_solid_color &= use_color_estimator;
 
   if (metadata.prediction_benchmarking) {
-    SkDevice device(SkBitmap::kARGB_8888_Config, rect.width(), rect.height());
+    gfx::Rect layer_rect = gfx::ToEnclosingRect(
+        gfx::ScaleRect(rect, 1.0f / contents_scale));
+
+    SkDevice device(
+        SkBitmap::kARGB_8888_Config, layer_rect.width(), layer_rect.height());
     SkCanvas canvas(&device);
-    picture_pile->Raster(&canvas, rect, contents_scale, NULL);
+    picture_pile->Raster(&canvas, layer_rect, 1.0f, NULL);
 
     const SkBitmap bitmap = device.accessBitmap(false);
     DCHECK_EQ(bitmap.rowBytes(),
               static_cast<size_t>(bitmap.width() * bitmap.bytesPerPixel()));
 
     RecordSolidColorPredictorResults(
         reinterpret_cast<SkPMColor*>(bitmap.getPixels()),
         bitmap.getSize() / bitmap.bytesPerPixel(),
         analysis->is_solid_color,
         SkPreMultiplyColor(analysis->solid_color));
@@ skipping 103 matching lines @@
                     is_predicted_solid && predicted_color != actual_color);
   HISTOGRAM_BOOLEAN("Renderer4.ColorPredictor.Accuracy",
                     is_predicted_solid == is_actually_solid &&
                     (!is_predicted_solid || predicted_color == actual_color));
   HISTOGRAM_BOOLEAN("Renderer4.ColorPredictor.IsCorrectSolid",
                     is_predicted_solid == is_actually_solid &&
                     (is_predicted_solid && predicted_color == actual_color));
 }
 
 }  // namespace cc