Fixes content scaling when resizing

Repro steps
1) Run chrome with --default-device-scale-factor=2
2) Maximize window
3) Web content gets scaled to twice the size it was before the window was maximized.

Bug=131806
Test=Manual

Review URL: https://chromiumcodereview.appspot.com/10533074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141842 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 4 deletions

diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 3b6099d..1ccd2dc 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -3212,16 +3212,30 @@ TEST_F(ViewLayerTest, ReorderUnderWidget) {
 TEST_F(ViewLayerTest, AcquireLayer) {
   View* content = new View;
   widget()->SetContentsView(content);
-  View* c1 = new View;
+  scoped_ptr<View> c1(new View);
   c1->SetPaintToLayer(true);
   EXPECT_TRUE(c1->layer());
-  content->AddChildView(c1);
+  content->AddChildView(c1.get());
 
   scoped_ptr<ui::Layer> layer(c1->AcquireLayer());
   EXPECT_EQ(layer.get(), c1->layer());
 
-  layer.reset(c1->RecreateLayer());
-  EXPECT_NE(c1->layer(), layer.get());
+  scoped_ptr<ui::Layer> layer2(c1->RecreateLayer());
+  EXPECT_NE(c1->layer(), layer2.get());
+
+  // Destroy view before destroying layer.
+  c1.reset();
+}
+
+// Verify that new layer scales content only if the old layer does.
+TEST_F(ViewLayerTest, RecreateLayer) {
+  scoped_ptr<View> v(new View());
+  v->SetPaintToLayer(true);
+  // Set to non default value.
+  v->layer()->set_scale_content(false);
+  scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
+  ui::Layer* new_layer = v->layer();
+  EXPECT_EQ(false, new_layer->scale_content());
 }
 
 #endif  // USE_AURA