cc: Rework how picture layer tiling set gets into raster queues.

cc/resources/raster_tile_priority_queue_required.cc

 // Copyright 2015 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/raster_tile_priority_queue_required.h"
 
+#include "base/containers/hash_tables.h"
 #include "cc/resources/tiling_set_raster_queue_required.h"
 
 namespace cc {
 
 RasterTilePriorityQueueRequired::RasterTilePriorityQueueRequired() {
 }
 
 RasterTilePriorityQueueRequired::~RasterTilePriorityQueueRequired() {
 }
 
 void RasterTilePriorityQueueRequired::Build(
-    const std::vector<PictureLayerImpl::Pair>& paired_layers,
+    const base::hash_map<int, PictureLayerTilingSet::Pair>&
+        paired_picture_layer_tiling_sets,
+    bool has_pending_tree,
     Type type) {
-  DCHECK_NE(static_cast<int>(type), static_cast<int>(Type::ALL));
-  for (const auto& pair : paired_layers) {
+  for (const auto& paired_tiling_set_pair : paired_picture_layer_tiling_sets) {
+    const auto& paired_tiling_set = paired_tiling_set_pair.second;
     PictureLayerTilingSet* tiling_set = nullptr;
-    if (type == Type::REQUIRED_FOR_DRAW && pair.active)
-      tiling_set = pair.active->picture_layer_tiling_set();
-    else if (type == Type::REQUIRED_FOR_ACTIVATION && pair.pending)
-      tiling_set = pair.pending->picture_layer_tiling_set();
+    switch (type) {
+      case Type::REQUIRED_FOR_DRAW: {
+        PictureLayerTilingSet* active = paired_tiling_set.active;
+        if (active && active->HasValidTilePriorities())
+          tiling_set = active;
+        break;
+      }
+      case Type::REQUIRED_FOR_ACTIVATION: {
+        PictureLayerTilingSet* pending = paired_tiling_set.pending;
+        if (has_pending_tree && pending && pending->HasValidTilePriorities())
+          tiling_set = pending;
+        break;
+      }
+      case Type::ALL:
+        NOTREACHED();
+        break;
+    }
 
     if (!tiling_set)
       continue;
 
     scoped_ptr<TilingSetRasterQueueRequired> tiling_set_queue(
         new TilingSetRasterQueueRequired(tiling_set, type));
     if (tiling_set_queue->IsEmpty())
       continue;
     tiling_set_queues_.push_back(tiling_set_queue.Pass());
   }
 }
 
 bool RasterTilePriorityQueueRequired::IsEmpty() const {
   return tiling_set_queues_.empty();
 }
 
 Tile* RasterTilePriorityQueueRequired::Top() {
   DCHECK(!IsEmpty());
   return tiling_set_queues_.back()->Top();
 }
 
 void RasterTilePriorityQueueRequired::Pop() {
   DCHECK(!IsEmpty());
   tiling_set_queues_.back()->Pop();
   if (tiling_set_queues_.back()->IsEmpty())
     tiling_set_queues_.pop_back();
 }
 
 }  // namespace cc