Revert of Fix bad scaling in TiledLayer

cc/test/tiled_layer_test_common.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/test/tiled_layer_test_common.h"
 
 namespace cc {
 
 FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer,
                                      scoped_ptr<PrioritizedResource> texture)
@@ skipping 11 matching lines @@
   ResourceUpdate upload = ResourceUpdate::Create(
       texture(), &bitmap_, kRect, kRect, gfx::Vector2d());
   if (partial_update)
     queue->AppendPartialUpload(upload);
   else
     queue->AppendFullUpload(upload);
 
   layer_->Update();
 }
 
-FakeLayerUpdater::FakeLayerUpdater()
-    : prepare_count_(0), update_count_(0), last_contents_width_scale_(0.f) {
-}
+FakeLayerUpdater::FakeLayerUpdater() : prepare_count_(0), update_count_(0) {}
 
 FakeLayerUpdater::~FakeLayerUpdater() {}
 
-void FakeLayerUpdater::PrepareToUpdate(const gfx::Size& content_size,
-                                       const gfx::Rect& paint_rect,
+void FakeLayerUpdater::PrepareToUpdate(const gfx::Rect& content_rect,
                                        const gfx::Size& tile_size,
                                        float contents_width_scale,
                                        float contents_height_scale) {
   prepare_count_++;
-  last_update_rect_ = paint_rect;
-  last_contents_width_scale_ = contents_width_scale;
+  last_update_rect_ = content_rect;
   if (!rect_to_invalidate_.IsEmpty()) {
     layer_->InvalidateContentRect(rect_to_invalidate_);
     rect_to_invalidate_ = gfx::Rect();
     layer_ = NULL;
   }
 }
 
 void FakeLayerUpdater::SetRectToInvalidate(const gfx::Rect& rect,
                                            FakeTiledLayer* layer) {
   rect_to_invalidate_ = rect;
@@ skipping 101 matching lines @@
     float* contents_scale_y,
     gfx::Size* content_bounds) {
   *contents_scale_x =
       static_cast<float>(forced_content_bounds_.width()) / bounds().width();
   *contents_scale_y =
       static_cast<float>(forced_content_bounds_.height()) / bounds().height();
   *content_bounds = forced_content_bounds_;
 }
 
 }  // namespace cc