cc: Remove ScopedPtrVector and cc::remove_if.

cc/tiles/raster_tile_priority_queue_all.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/tiles/raster_tile_priority_queue_all.h"
 
 #include "cc/tiles/tiling_set_raster_queue_all.h"
 
 namespace cc {
 
 namespace {
 
 class RasterOrderComparator {
  public:
   explicit RasterOrderComparator(TreePriority tree_priority)
       : tree_priority_(tree_priority) {}
 
-  bool operator()(const TilingSetRasterQueueAll* a_queue,
-                  const TilingSetRasterQueueAll* b_queue) const {
+  bool operator()(const scoped_ptr<TilingSetRasterQueueAll>& a_queue,
+                  const scoped_ptr<TilingSetRasterQueueAll>& b_queue) const {
     // Note that in this function, we have to return true if and only if
     // a is strictly lower priority than b.
     const TilePriority& a_priority = a_queue->Top().priority();
     const TilePriority& b_priority = b_queue->Top().priority();
     bool prioritize_low_res = tree_priority_ == SMOOTHNESS_TAKES_PRIORITY;
 
     // If the bin is the same but the resolution is not, then the order will be
     // determined by whether we prioritize low res or not.
     // TODO(vmpstr): Remove this when TilePriority is no longer a member of Tile
     // class but instead produced by the iterators.
@@ skipping 14 matching lines @@
     return b_priority.IsHigherPriorityThan(a_priority);
   }
 
  private:
   TreePriority tree_priority_;
 };
 
 void CreateTilingSetRasterQueues(
     const std::vector<PictureLayerImpl*>& layers,
     TreePriority tree_priority,
-    ScopedPtrVector<TilingSetRasterQueueAll>* queues) {
+    std::vector<scoped_ptr<TilingSetRasterQueueAll>>* queues) {
   DCHECK(queues->empty());
 
   for (auto* layer : layers) {
     if (!layer->HasValidTilePriorities())
       continue;
 
     PictureLayerTilingSet* tiling_set = layer->picture_layer_tiling_set();
     bool prioritize_low_res = tree_priority == SMOOTHNESS_TAKES_PRIORITY;
     scoped_ptr<TilingSetRasterQueueAll> tiling_set_queue = make_scoped_ptr(
         new TilingSetRasterQueueAll(tiling_set, prioritize_low_res));
     // Queues will only contain non empty tiling sets.
     if (!tiling_set_queue->IsEmpty())
       queues->push_back(tiling_set_queue.Pass());
   }
-  queues->make_heap(RasterOrderComparator(tree_priority));
+  std::make_heap(queues->begin(), queues->end(),
+                 RasterOrderComparator(tree_priority));
 }
 
 }  // namespace
 
 RasterTilePriorityQueueAll::RasterTilePriorityQueueAll() {
 }
 
 RasterTilePriorityQueueAll::~RasterTilePriorityQueueAll() {
 }
 
 void RasterTilePriorityQueueAll::Build(
     const std::vector<PictureLayerImpl*>& active_layers,
     const std::vector<PictureLayerImpl*>& pending_layers,
     TreePriority tree_priority) {
   tree_priority_ = tree_priority;
 
   CreateTilingSetRasterQueues(active_layers, tree_priority_, &active_queues_);
   CreateTilingSetRasterQueues(pending_layers, tree_priority_, &pending_queues_);
 }
 
 bool RasterTilePriorityQueueAll::IsEmpty() const {
   return active_queues_.empty() && pending_queues_.empty();
 }
 
 const PrioritizedTile& RasterTilePriorityQueueAll::Top() const {
   DCHECK(!IsEmpty());
-  const ScopedPtrVector<TilingSetRasterQueueAll>& next_queues = GetNextQueues();
+  const std::vector<scoped_ptr<TilingSetRasterQueueAll>>& next_queues =

[danakj, 2015/11/17 01:12:18]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

+      GetNextQueues();
   return next_queues.front()->Top();
 }
 
 void RasterTilePriorityQueueAll::Pop() {
   DCHECK(!IsEmpty());
 
-  ScopedPtrVector<TilingSetRasterQueueAll>& next_queues = GetNextQueues();
-  next_queues.pop_heap(RasterOrderComparator(tree_priority_));
-  TilingSetRasterQueueAll* queue = next_queues.back();
+  std::vector<scoped_ptr<TilingSetRasterQueueAll>>& next_queues =

[danakj, 2015/11/17 01:12:18]

auto?

[vmpstr, 2015/11/17 23:26:25]

Done.

+      GetNextQueues();
+  std::pop_heap(next_queues.begin(), next_queues.end(),
+                RasterOrderComparator(tree_priority_));
+  TilingSetRasterQueueAll* queue = next_queues.back().get();
   queue->Pop();
 
   // Remove empty queues.
-  if (queue->IsEmpty())
+  if (queue->IsEmpty()) {
     next_queues.pop_back();
-  else
-    next_queues.push_heap(RasterOrderComparator(tree_priority_));
+  } else {
+    std::push_heap(next_queues.begin(), next_queues.end(),
+                   RasterOrderComparator(tree_priority_));
+  }
 }
 
-ScopedPtrVector<TilingSetRasterQueueAll>&
+std::vector<scoped_ptr<TilingSetRasterQueueAll>>&
 RasterTilePriorityQueueAll::GetNextQueues() {
-  return const_cast<ScopedPtrVector<TilingSetRasterQueueAll>&>(
+  return const_cast<std::vector<scoped_ptr<TilingSetRasterQueueAll>>&>(

[danakj, 2015/11/17 01:12:18]

heh. temp vars?

[vmpstr, 2015/11/17 23:26:25]

Done.

       static_cast<const RasterTilePriorityQueueAll*>(this)->GetNextQueues());
 }
 
-const ScopedPtrVector<TilingSetRasterQueueAll>&
+const std::vector<scoped_ptr<TilingSetRasterQueueAll>>&
 RasterTilePriorityQueueAll::GetNextQueues() const {
   DCHECK(!IsEmpty());
 
   // If we only have one queue with tiles, return it.
   if (active_queues_.empty())
     return pending_queues_;
   if (pending_queues_.empty())
     return active_queues_;
 
   const PrioritizedTile& active_tile = active_queues_.front()->Top();
@@ skipping 30 matching lines @@
         return active_queues_;
       return pending_queues_;
     }
     default:
       NOTREACHED();
       return active_queues_;
   }
 }
 
 }  // namespace cc