Add PictureLayerTiling pointer to Tile

This is preperatory work which will allow for cheaper update of the
req'd for activation/draw status in the client side scheduler work.

BUG=673434
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2564433003
Cr-Commit-Position: refs/heads/master@{#437990}

cc/tiles/picture_layer_tiling.cc

@@ -156,17 +156,14 @@ void PictureLayerTiling::TakeTilesAndPropertiesFrom(
     SetLiveTilesRect(pending_twin->live_tiles_rect());
   }
 
-  if (tiles_.empty()) {
-    tiles_.swap(pending_twin->tiles_);
-    all_tiles_done_ = pending_twin->all_tiles_done_;
-  } else {
-    while (!pending_twin->tiles_.empty()) {
-      auto pending_iter = pending_twin->tiles_.begin();
-      tiles_[pending_iter->first] = std::move(pending_iter->second);
-      pending_twin->tiles_.erase(pending_iter);
-    }
-    all_tiles_done_ &= pending_twin->all_tiles_done_;
+  while (!pending_twin->tiles_.empty()) {
+    auto pending_iter = pending_twin->tiles_.begin();
+    pending_iter->second->set_tiling(this);
+    tiles_[pending_iter->first] = std::move(pending_iter->second);
+    pending_twin->tiles_.erase(pending_iter);
   }
+  all_tiles_done_ &= pending_twin->all_tiles_done_;
+
   DCHECK(pending_twin->tiles_.empty());
   pending_twin->all_tiles_done_ = true;
 
@@ -323,7 +320,7 @@ Tile::CreateInfo PictureLayerTiling::CreateInfoForTile(int i, int j) const {
   tile_rect.set_size(tiling_data_.max_texture_size());
   gfx::Rect enclosing_layer_rect = gfx::ScaleToEnclosingRect(
       tile_rect, 1.f / raster_scales_.width(), 1.f / raster_scales_.height());
-  return Tile::CreateInfo(i, j, enclosing_layer_rect, tile_rect,
+  return Tile::CreateInfo(this, i, j, enclosing_layer_rect, tile_rect,
                           raster_scales_);
 }
 

cc/tiles/picture_layer_tiling_unittest.cc

@@ -1062,5 +1062,32 @@ TEST_F(PictureLayerTilingIteratorTest, TightCover2) {
   VerifyTilesExactlyCoverRect(dest_scale, gfx::Rect(10001, 2));
 }
 
+TEST_F(PictureLayerTilingIteratorTest, TilesStoreTilings) {
+  gfx::Size bounds(200, 200);
+  Initialize(gfx::Size(100, 100), 1.f, bounds);
+  SetLiveRectAndVerifyTiles(gfx::Rect(bounds));
+
+  // Get all tiles and ensure they are associated with |tiling_|.
+  std::vector<Tile*> tiles = tiling_->AllTilesForTesting();
+  EXPECT_TRUE(tiles.size());
+  for (const auto* tile : tiles) {
+    EXPECT_EQ(tile->tiling(), tiling_.get());
+  }
+
+  // Create an active tiling, transfer tiles to that tiling, and ensure that
+  // the tiles have their tiling updated.
+  scoped_refptr<FakeRasterSource> raster_source =
+      FakeRasterSource::CreateFilled(bounds);
+  auto active_tiling = TestablePictureLayerTiling::Create(
+      ACTIVE_TREE, 1.f, raster_source, &client_, LayerTreeSettings());
+  active_tiling->set_resolution(HIGH_RESOLUTION);
+
+  active_tiling->TakeTilesAndPropertiesFrom(tiling_.get(),
+                                            Region(gfx::Rect(bounds)));
+  for (const auto* tile : tiles) {
+    EXPECT_EQ(tile->tiling(), active_tiling.get());
+  }
+}
+
 }  // namespace
 }  // namespace cc

cc/tiles/tile.cc

@@ -23,6 +23,7 @@ Tile::Tile(TileManager* tile_manager,
            int source_frame_number,
            int flags)
     : tile_manager_(tile_manager),
+      tiling_(info.tiling),
       content_rect_(info.content_rect),
       enclosing_layer_rect_(info.enclosing_layer_rect),
       raster_scales_(info.raster_scales),

cc/tiles/tile.h

@@ -17,6 +17,7 @@
 
 namespace cc {
 
+class PictureLayerTiling;
 class TileManager;
 
 class CC_EXPORT Tile {
@@ -28,18 +29,21 @@ class CC_EXPORT Tile {
 
   class CC_EXPORT CreateInfo {
    public:
+    const PictureLayerTiling* tiling;
     int tiling_i_index;
     int tiling_j_index;
     gfx::Rect enclosing_layer_rect;
     gfx::Rect content_rect;
     gfx::SizeF raster_scales;
 
-    CreateInfo(int tiling_i_index,
+    CreateInfo(const PictureLayerTiling* tiling,
+               int tiling_i_index,
                int tiling_j_index,
                const gfx::Rect& enclosing_layer_rect,
                const gfx::Rect& content_rect,
                const gfx::SizeF& raster_scales)
-        : tiling_i_index(tiling_i_index),
+        : tiling(tiling),
+          tiling_i_index(tiling_i_index),
           tiling_j_index(tiling_j_index),
           enclosing_layer_rect(enclosing_layer_rect),
           content_rect(content_rect),
@@ -113,6 +117,9 @@ class CC_EXPORT Tile {
     return is_solid_color_analysis_performed_;
   }
 
+  const PictureLayerTiling* tiling() const { return tiling_; }
+  void set_tiling(const PictureLayerTiling* tiling) { tiling_ = tiling; }
+
  private:
   friend class TileManager;
   friend class FakeTileManager;
@@ -127,6 +134,7 @@ class CC_EXPORT Tile {
   ~Tile();
 
   TileManager* const tile_manager_;
+  const PictureLayerTiling* tiling_;
   const gfx::Rect content_rect_;
   const gfx::Rect enclosing_layer_rect_;
   const gfx::SizeF raster_scales_;