cc: Invalidate the full tiled layer when contents scale changes.

Previously we invalidated only the area outside of the previous
bounds, but this is incorrect when changing the scale.

The verifyInvalidationWhenContentsScaleChanges test was not actually
testing to make sure invalidation happened, so fixed the test to do
its job.

Tests:
TiledLayerTest.verifyInvalidationWhenContentsScaleChanges

BUG=166715
R=enne
NOTRY=true

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

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

1 files changed, 8 insertions, 3 deletions

diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 7fb252f..dd636ef 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -788,11 +788,12 @@ TEST_F(TiledLayerTest, verifyInvalidationWhenContentsScaleChanges)
     EXPECT_FALSE(layerImpl->hasResourceIdForTileAt(1, 0));
     EXPECT_FALSE(layerImpl->hasResourceIdForTileAt(1, 1));
 
-    // Change the contents scale and verify that the content rectangle requiring painting
-    // is not scaled.
+    layer->setNeedsDisplayRect(gfx::Rect());
+    EXPECT_FLOAT_RECT_EQ(gfx::RectF(), layer->lastNeedsDisplayRect());
+
+    // Change the contents scale.
     layer->updateContentsScale(2);
     layer->drawProperties().visible_content_rect = gfx::Rect(0, 0, 200, 200);
-    EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 100, 100), layer->lastNeedsDisplayRect());
 
     // The impl side should get 2x2 tiles now.
     layer->setTexturePriorities(m_priorityCalculator);
@@ -805,6 +806,10 @@ TEST_F(TiledLayerTest, verifyInvalidationWhenContentsScaleChanges)
     EXPECT_TRUE(layerImpl->hasResourceIdForTileAt(1, 0));
     EXPECT_TRUE(layerImpl->hasResourceIdForTileAt(1, 1));
 
+    // Verify that changing the contents scale caused invalidation, and
+    // that the layer-space rectangle requiring painting is not scaled.
+    EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 0, 100, 100), layer->lastNeedsDisplayRect());
+
     // Invalidate the entire layer again, but do not paint. All tiles should be gone now from the
     // impl side.
     layer->setNeedsDisplay();