Revert of Fix bad scaling in TiledLayer

cc/resources/skpicture_content_layer_updater.cc

Index: cc/resources/skpicture_content_layer_updater.cc
diff --git a/cc/resources/skpicture_content_layer_updater.cc b/cc/resources/skpicture_content_layer_updater.cc
index bd524f235f1cd53a6b947236dead75c17412592f..7e8ffee26619e3d7032847590d1bb7f031d53371 100644
--- a/cc/resources/skpicture_content_layer_updater.cc
+++ b/cc/resources/skpicture_content_layer_updater.cc
@@ -23,27 +23,23 @@
 SkPictureContentLayerUpdater::~SkPictureContentLayerUpdater() {}
 
 void SkPictureContentLayerUpdater::PrepareToUpdate(
-    const gfx::Size& content_size,
-    const gfx::Rect& paint_rect,
-    const gfx::Size& tile_size,
+    const gfx::Rect& content_rect,
+    const gfx::Size&,
     float contents_width_scale,
     float contents_height_scale) {
   SkPictureRecorder recorder;
-  SkCanvas* canvas =
-      recorder.beginRecording(paint_rect.width(), paint_rect.height(), NULL, 0);
-  DCHECK_EQ(paint_rect.width(), canvas->getBaseLayerSize().width());
-  DCHECK_EQ(paint_rect.height(), canvas->getBaseLayerSize().height());
+  SkCanvas* canvas = recorder.beginRecording(
+      content_rect.width(), content_rect.height(), NULL, 0);
+  DCHECK_EQ(content_rect.width(), canvas->getBaseLayerSize().width());
+  DCHECK_EQ(content_rect.height(), canvas->getBaseLayerSize().height());
   base::TimeTicks start_time =
       rendering_stats_instrumentation_->StartRecording();
-  PaintContents(canvas,
-                content_size,
-                paint_rect,
-                contents_width_scale,
-                contents_height_scale);
+  PaintContents(
+      canvas, content_rect, contents_width_scale, contents_height_scale);
   base::TimeDelta duration =
       rendering_stats_instrumentation_->EndRecording(start_time);
   rendering_stats_instrumentation_->AddRecord(
-      duration, paint_rect.width() * paint_rect.height());
+      duration, content_rect.width() * content_rect.height());
   picture_ = skia::AdoptRef(recorder.endRecording());
 }