cc: Simplify the logic for deciding to update tile priorities.

cc/resources/picture_layer_tiling_unittest.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/resources/picture_layer_tiling.h"
 
 #include "cc/test/fake_picture_layer_tiling_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
@@ skipping 86 matching lines @@
   }
 
   void VerifyTilesExactlyCoverRect(float rect_scale, gfx::Rect rect) {
     VerifyTilesExactlyCoverRect(rect_scale, rect, rect);
   }
 
   void VerifyTiles(
       float rect_scale,
       gfx::Rect rect,
       base::Callback<void(Tile* tile, gfx::Rect geometry_rect)> callback) {
+    VerifyTiles(tiling_.get(),
+                rect_scale,
+                rect,
+                callback);
+  }
+
+  void VerifyTiles(
+      PictureLayerTiling* tiling,
+      float rect_scale,
+      gfx::Rect rect,
+      base::Callback<void(Tile* tile, gfx::Rect geometry_rect)> callback) {
     Region remaining = rect;
-    for (PictureLayerTiling::CoverageIterator iter(
-             tiling_.get(), rect_scale, rect);
+    for (PictureLayerTiling::CoverageIterator iter(tiling, rect_scale, rect);
          iter;
          ++iter) {
       remaining.Subtract(iter.geometry_rect());
       callback.Run(*iter, iter.geometry_rect());
     }
     EXPECT_TRUE(remaining.IsEmpty());
   }
 
   void VerifyTilesCoverNonContainedRect(float rect_scale, gfx::Rect dest_rect) {
     float dest_to_contents_scale = tiling_->contents_scale() / rect_scale;
@@ skipping 343 matching lines @@
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       gfx::Rect(layer_bounds),  // viewport in layer space
       gfx::Rect(layer_bounds),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      1,  // current frame number
       1.0,  // current frame time
       false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 
   // Make the viewport rect empty. All tiles are killed and become zombies.
   tiling_->UpdateTilePriorities(
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       gfx::Rect(),  // viewport in layer space
       gfx::Rect(),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      2,  // current frame number
       2.0,  // current frame time
       false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, false));
 }
 
 TEST_F(PictureLayerTilingIteratorTest, TilesExistGiantViewport) {
   gfx::Size layer_bounds(1099, 801);
   Initialize(gfx::Size(100, 100), 1.f, layer_bounds);
   VerifyTilesExactlyCoverRect(1.f, gfx::Rect(layer_bounds));
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, false));
 
   gfx::Rect giant_rect(-10000000, -10000000, 1000000000, 1000000000);
 
   tiling_->UpdateTilePriorities(
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       giant_rect,  // viewport in layer space
       gfx::Rect(layer_bounds),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      1,  // current frame number
       1.0,  // current frame time
       false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 
   // If the visible content rect is empty, it should still have live tiles.
   tiling_->UpdateTilePriorities(
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       giant_rect,  // viewport in layer space
       gfx::Rect(),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      2,  // current frame number
       2.0,  // current frame time
       false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 }
 
 TEST_F(PictureLayerTilingIteratorTest, TilesExistOutsideViewport) {
   gfx::Size layer_bounds(1099, 801);
   Initialize(gfx::Size(100, 100), 1.f, layer_bounds);
   VerifyTilesExactlyCoverRect(1.f, gfx::Rect(layer_bounds));
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, false));
 
   // This rect does not intersect with the layer, as the layer is outside the
   // viewport.
   gfx::Rect viewport_rect(1100, 0, 1000, 1000);
   EXPECT_FALSE(viewport_rect.Intersects(gfx::Rect(layer_bounds)));
 
   tiling_->UpdateTilePriorities(
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       viewport_rect,  // viewport in layer space
       gfx::Rect(),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      2,  // current frame number
-      2.0,  // current frame time
+      1.0,  // current frame time
       false,  // store screen space quads on tiles
       10000);  // max tiles in tile manager
   VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
 }
 
 static void TilesIntersectingRectExist(gfx::Rect rect,
                                        Tile* tile,
                                        gfx::Rect geometry_rect) {
   bool expected_exists = rect.Intersects(geometry_rect);
   EXPECT_EQ(expected_exists, tile != NULL)
@@ skipping 14 matching lines @@
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       gfx::Rect(layer_bounds),  // viewport in layer space
       visible_rect,  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      2,  // current frame number
-      2.0,  // current frame time
+      1.0,  // current frame time
       false,  // store screen space quads on tiles
       1);  // max tiles in tile manager
   VerifyTiles(1.f,
               gfx::Rect(layer_bounds),
               base::Bind(&TilesIntersectingRectExist, visible_rect));
 }
 
 static void CountExistingTiles(int *count,
                                Tile* tile,
                                gfx::Rect geometry_rect) {
@@ skipping 12 matching lines @@
       ACTIVE_TREE,
       layer_bounds,  // device viewport
       gfx::Rect(layer_bounds),  // viewport in layer space
       gfx::Rect(layer_bounds),  // visible content rect
       layer_bounds,  // last layer bounds
       layer_bounds,  // current layer bounds
       1.f,  // last contents scale
       1.f,  // current contents scale
       gfx::Transform(),  // last screen transform
       gfx::Transform(),  // current screen transform
-      2,  // current frame number
-      2.0,  // current frame time
+      1.0,  // current frame time
       false,  // store screen space quads on tiles
       1);  // max tiles in tile manager
 
   int num_tiles = 0;
   VerifyTiles(1.f,
               gfx::Rect(layer_bounds),
               base::Bind(&CountExistingTiles, &num_tiles));
   // If we're making a rect the size of one tile, it can only overlap up to 4
   // tiles depending on its position.
   EXPECT_LE(num_tiles, 4);
   VerifyTiles(1.f, gfx::Rect(), base::Bind(&TileExists, false));
 }
 
+TEST_F(PictureLayerTilingIteratorTest, Clone) {
+  gfx::Size layer_bounds(1099, 801);
+  Initialize(gfx::Size(100, 100), 1.f, layer_bounds);
+
+  VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, false));
+
+  tiling_->UpdateTilePriorities(
+      PENDING_TREE,
+      layer_bounds,  // device viewport
+      gfx::Rect(layer_bounds),  // viewport in layer space
+      gfx::Rect(layer_bounds),  // visible content rect
+      layer_bounds,  // last layer bounds
+      layer_bounds,  // current layer bounds
+      1.f,  // last contents scale
+      1.f,  // current contents scale
+      gfx::Transform(),  // last screen transform
+      gfx::Transform(),  // current screen transform
+      1.0,  // current frame time
+      false,  // store screen space quads on tiles
+      10000);  // max tiles in tile manager
+  tiling_->set_resolution(HIGH_RESOLUTION);
+
+  // The pending tiling has tiles now.
+  VerifyTiles(1.f, gfx::Rect(layer_bounds), base::Bind(&TileExists, true));
+  EXPECT_EQ(HIGH_RESOLUTION, tiling_->resolution());
+
+  // Clone to the active tiling.
+  scoped_ptr<PictureLayerTiling> active_tiling =
+      tiling_->Clone(layer_bounds, &client_);
+
+  // The active tiling starts with no tiles.
+  VerifyTiles(active_tiling.get(),
+              1.f,
+              gfx::Rect(layer_bounds),
+              base::Bind(&TileExists, false));
+  EXPECT_EQ(HIGH_RESOLUTION, tiling_->resolution());
+
+  // UpdateTilePriorities on the active tiling at the same frame time. The
+  // active tiling should get tiles.
+  active_tiling->UpdateTilePriorities(
+      PENDING_TREE,
+      layer_bounds,  // device viewport
+      gfx::Rect(layer_bounds),  // viewport in layer space
+      gfx::Rect(layer_bounds),  // visible content rect
+      layer_bounds,  // last layer bounds
+      layer_bounds,  // current layer bounds
+      1.f,  // last contents scale
+      1.f,  // current contents scale
+      gfx::Transform(),  // last screen transform
+      gfx::Transform(),  // current screen transform
+      1.0,  // current frame time
+      false,  // store screen space quads on tiles
+      10000);  // max tiles in tile manager
+  VerifyTiles(active_tiling.get(),
+              1.f,
+              gfx::Rect(layer_bounds),
+              base::Bind(&TileExists, true));
+}
+
 }  // namespace
 }  // namespace cc