Revert of Fix bad scaling in TiledLayer

cc/resources/layer_updater.h

 // Copyright 2011 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.
 
 #ifndef CC_RESOURCES_LAYER_UPDATER_H_
 #define CC_RESOURCES_LAYER_UPDATER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
 namespace cc {
 
 class PrioritizedResource;
 class PrioritizedResourceManager;
 class ResourceUpdateQueue;
 class TextureManager;
 
@@ skipping 18 matching lines @@
    private:
     scoped_ptr<PrioritizedResource> texture_;
 
     DISALLOW_COPY_AND_ASSIGN(Resource);
   };
 
   LayerUpdater() {}
 
   virtual scoped_ptr<Resource> CreateResource(
       PrioritizedResourceManager* manager) = 0;
-  virtual void PrepareToUpdate(const gfx::Size& content_size,
-                               const gfx::Rect& paint_rect,
+  virtual void PrepareToUpdate(const gfx::Rect& content_rect,
                                const gfx::Size& tile_size,
                                float contents_width_scale,
                                float contents_height_scale) {}
   virtual void ReduceMemoryUsage() {}
 
   // Set true by the layer when it is known that the entire output is going to
   // be opaque.
   virtual void SetOpaque(bool opaque) {}
   // Set true by the layer when it is known that the entire output bounds will
   // be rasterized.
   virtual void SetFillsBoundsCompletely(bool fills_bounds) {}
-  virtual void SetBackgroundColor(SkColor background_color) {}
 
  protected:
   virtual ~LayerUpdater() {}
 
  private:
   friend class base::RefCounted<LayerUpdater>;
 
   DISALLOW_COPY_AND_ASSIGN(LayerUpdater);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_LAYER_UPDATER_H_