Fix bad scaling in TiledLayer

cc/layers/tiled_layer_unittest.cc

 // 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.
 
 #include "cc/layers/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/run_loop.h"
@@ skipping 271 matching lines @@
   layer->InvalidateContentRect(gfx::Rect(0, 0, 100, 200));
   layer->draw_properties().visible_content_rect = gfx::Rect(0, 0, 100, 100);
   UpdateAndPush(layer, layer_impl);
 
   // We should only have the first tile since the other tile was invalidated but
   // not painted.
   EXPECT_TRUE(layer_impl->HasResourceIdForTileAt(0, 0));
   EXPECT_FALSE(layer_impl->HasResourceIdForTileAt(0, 1));
 }
 
+TEST_F(TiledLayerTest, Scale) {
+  layer_tree_host_->SetDeviceScaleFactor(1.5);
+
+  scoped_refptr<FakeTiledLayer> layer =
+      make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
+  scoped_ptr<FakeTiledLayerImpl> layer_impl =
+      make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
+  RenderSurfaceLayerList render_surface_layer_list;
+
+  layer_tree_host_->root_layer()->AddChild(layer);
+
+  layer->SetBounds(gfx::Size(100, 200));
+  CalcDrawProps(&render_surface_layer_list);
+
+  // Change the width so that it doesn't divide cleanly by the scale.
+  layer->SetBounds(gfx::Size(101, 200));
+  UpdateAndPush(layer, layer_impl);
+
+  EXPECT_EQ(1.5, layer->fake_layer_updater()->last_contents_width_scale());
+}
+
 TEST_F(TiledLayerTest, PushOccludedDirtyTiles) {
   scoped_refptr<FakeTiledLayer> layer =
       make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
   scoped_ptr<FakeTiledLayerImpl> layer_impl =
       make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
   TestOcclusionTracker occluded;
   occlusion_ = &occluded;
   layer_tree_host_->SetViewportSize(gfx::Size(1000, 1000));
 
   layer_tree_host_->root_layer()->AddChild(layer);
@@ skipping 1423 matching lines @@
   // Invalidate the entire layer in layer space. When painting, the rect given
   // to webkit should match the layer's bounds.
   layer->SetNeedsDisplayRect(layer_rect);
   layer->Update(queue_.get(), NULL);
 
   EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc