Update from https://crrev.com/312398

cc/resources/tile_manager.h

 // 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.
 
 #ifndef CC_RESOURCES_TILE_MANAGER_H_
 #define CC_RESOURCES_TILE_MANAGER_H_
 
 #include <deque>
 #include <queue>
 #include <set>
@@ skipping 81 matching lines @@
  public:
   enum NamedTaskSet {
     REQUIRED_FOR_ACTIVATION,
     REQUIRED_FOR_DRAW,
     // PixelBufferTileTaskWorkerPool depends on ALL being last.
     ALL
     // Adding additional values requires increasing kNumberOfTaskSets in
     // rasterizer.h
   };
 
-  COMPILE_ASSERT(NamedTaskSet::ALL == (kNumberOfTaskSets - 1),
-                 NamedTaskSet_ALL_not_kNumberOfTaskSets_minus_1);
+  static_assert(NamedTaskSet::ALL == (kNumberOfTaskSets - 1),
+                "NamedTaskSet::ALL should be equal to kNumberOfTaskSets"
+                "minus 1");
 
   static scoped_ptr<TileManager> Create(TileManagerClient* client,
                                         base::SequencedTaskRunner* task_runner,
                                         ResourcePool* resource_pool,
                                         TileTaskRunner* tile_task_runner,
                                         Rasterizer* rasterizer,
                                         size_t scheduled_raster_task_limit);
   ~TileManager() override;
 
   // Assigns tile memory and schedules work to prepare tiles for drawing.
@@ skipping 17 matching lines @@
       const;
   void BasicStateAsValueInto(base::debug::TracedValue* dict) const;
   const MemoryHistory::Entry& memory_stats_from_last_assign() const {
     return memory_stats_from_last_assign_;
   }
 
   void InitializeTilesWithResourcesForTesting(const std::vector<Tile*>& tiles) {
     for (size_t i = 0; i < tiles.size(); ++i) {
       TileDrawInfo& draw_info = tiles[i]->draw_info();
       draw_info.resource_ =
-          resource_pool_->AcquireResource(tiles[i]->desired_texture_size());
+          resource_pool_->AcquireResource(tiles[i]->desired_texture_size(),
+                                          resource_pool_->default_format());
     }
   }
 
   void ReleaseTileResourcesForTesting(const std::vector<Tile*>& tiles) {
     for (size_t i = 0; i < tiles.size(); ++i) {
       Tile* tile = tiles[i];
       FreeResourcesForTile(tile);
     }
   }
 
@@ skipping 41 matching lines @@
   void DidFinishRunningTileTasks(TaskSet task_set) override;
   TaskSetCollection TasksThatShouldBeForcedToComplete() const override;
 
   typedef std::vector<Tile*> TileVector;
   typedef std::set<Tile*> TileSet;
 
   // Virtual for test
   virtual void ScheduleTasks(
       const TileVector& tiles_that_need_to_be_rasterized);
 
-  void AssignGpuMemoryToTiles(TileVector* tiles_that_need_to_be_rasterized,
+  void AssignGpuMemoryToTiles(RasterTilePriorityQueue* raster_priority_queue,
                               size_t scheduled_raser_task_limit,
-                              bool required_for_draw_only);
+                              TileVector* tiles_that_need_to_be_rasterized);
 
   void SynchronouslyRasterizeTiles(
       const GlobalStateThatImpactsTilePriority& state);
 
  private:
   class MemoryUsage {
    public:
     MemoryUsage();
     MemoryUsage(int64 memory_bytes, int resource_count);
 
@@ skipping 80 matching lines @@
   TileTaskQueue raster_queue_;
 
   std::vector<scoped_refptr<RasterTask>> orphan_raster_tasks_;
 
   UniqueNotifier ready_to_activate_notifier_;
   UniqueNotifier ready_to_draw_notifier_;
   UniqueNotifier ready_to_activate_check_notifier_;
   UniqueNotifier ready_to_draw_check_notifier_;
   UniqueNotifier more_tiles_need_prepare_check_notifier_;
 
-  RasterTilePriorityQueue raster_priority_queue_;
   EvictionTilePriorityQueue eviction_priority_queue_;
   bool eviction_priority_queue_is_up_to_date_;
 
   bool did_notify_ready_to_activate_;
   bool did_notify_ready_to_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_