Revert of cc: Remove tile sharing from tilings.

cc/test/fake_picture_layer_impl.cc

 // Copyright 2013 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/test/fake_picture_layer_impl.h"
 
 #include <vector>
 #include "cc/resources/tile.h"
 #include "cc/trees/layer_tree_impl.h"
 
@@ skipping 130 matching lines @@
       is ? layer_tree_impl()->current_render_surface_list_id()
          : layer_tree_impl()->current_render_surface_list_id() - 1;
 }
 
 void FakePictureLayerImpl::CreateAllTiles() {
   for (size_t i = 0; i < num_tilings(); ++i)
     tilings_->tiling_at(i)->CreateAllTilesForTesting();
 }
 
 void FakePictureLayerImpl::SetAllTilesVisible() {
+  WhichTree tree =
+      layer_tree_impl()->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
+
   for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
        ++tiling_idx) {
     PictureLayerTiling* tiling = tilings_->tiling_at(tiling_idx);
     std::vector<Tile*> tiles = tiling->AllTilesForTesting();
     for (size_t tile_idx = 0; tile_idx < tiles.size(); ++tile_idx) {
       Tile* tile = tiles[tile_idx];
       TilePriority priority;
       priority.resolution = HIGH_RESOLUTION;
       priority.priority_bin = TilePriority::NOW;
       priority.distance_to_visible = 0.f;
-      tile->set_priority(priority);
+      tile->SetPriority(tree, priority);
     }
   }
 }
 
 void FakePictureLayerImpl::ResetAllTilesPriorities() {
   for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
        ++tiling_idx) {
     PictureLayerTiling* tiling = tilings_->tiling_at(tiling_idx);
     std::vector<Tile*> tiles = tiling->AllTilesForTesting();
     for (size_t tile_idx = 0; tile_idx < tiles.size(); ++tile_idx) {
       Tile* tile = tiles[tile_idx];
-      tile->set_priority(TilePriority());
+      tile->SetPriority(ACTIVE_TREE, TilePriority());
+      tile->SetPriority(PENDING_TREE, TilePriority());
     }
   }
 }
 
 void FakePictureLayerImpl::SetAllTilesReady() {
   for (size_t tiling_idx = 0; tiling_idx < tilings_->num_tilings();
        ++tiling_idx) {
     PictureLayerTiling* tiling = tilings_->tiling_at(tiling_idx);
     SetAllTilesReadyInTiling(tiling);
   }
@@ skipping 65 matching lines @@
     }
   }
 
   return count;
 }
 
 size_t FakePictureLayerImpl::CountTilesRequiredForActivation() const {
   if (!layer_tree_impl()->IsPendingTree())
     return 0;
 
-  return CountTilesRequired(&PictureLayerTiling::IsTileRequiredForActivation);
+  return CountTilesRequired(
+      &PictureLayerTiling::IsTileRequiredForActivationIfVisible);
 }
 
 size_t FakePictureLayerImpl::CountTilesRequiredForDraw() const {
   if (!layer_tree_impl()->IsActiveTree())
     return 0;
 
-  return CountTilesRequired(&PictureLayerTiling::IsTileRequiredForDraw);
+  return CountTilesRequired(
+      &PictureLayerTiling::IsTileRequiredForDrawIfVisible);
 }
 
 void FakePictureLayerImpl::ReleaseResources() {
   PictureLayerImpl::ReleaseResources();
   ++release_resources_count_;
 }
 
 }  // namespace cc