cc: Split RasterTilePriorityQueue into required and all based on type.

cc/resources/raster_tile_priority_queue_all.h

 // Copyright 2014 The Chromium Authors. All rights reserved.

[danakj, 2015/01/22 20:24:16]

update the year in new files

[vmpstr, 2015/01/22 22:44:35]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
-#define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
+#ifndef CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
+#define CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
 
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/picture_layer_impl.h"
+#include "cc/resources/raster_tile_priority_queue.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/resources/tiling_set_raster_queue.h"
 
 namespace cc {
 
-// TODO(vmpstr): Consider virtualizing this and adding ::Create with the
-// parameters of ::Build that would create a simpler queue for required only
-// tiles (ie, there's no need for the heap if all we're interested in are the
-// required tiles.
-class CC_EXPORT RasterTilePriorityQueue {
+class CC_EXPORT RasterTilePriorityQueueAll : public RasterTilePriorityQueue {
  public:
-  enum class Type { ALL, REQUIRED_FOR_ACTIVATION, REQUIRED_FOR_DRAW };
-
   class PairedTilingSetQueue {
    public:
     PairedTilingSetQueue();
     PairedTilingSetQueue(const PictureLayerImpl::Pair& layer_pair,
-                         TreePriority tree_priority,
-                         Type type);
+                         TreePriority tree_priority);
     ~PairedTilingSetQueue();
 
     bool IsEmpty() const;
     Tile* Top(TreePriority tree_priority);
     void Pop(TreePriority tree_priority);
 
     WhichTree NextTileIteratorTree(TreePriority tree_priority) const;
     void SkipTilesReturnedByTwin(TreePriority tree_priority);
 
     scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
 
     const TilingSetRasterQueue* active_queue() const {
       return active_queue_.get();
     }
     const TilingSetRasterQueue* pending_queue() const {
       return pending_queue_.get();
     }
 
    private:
     scoped_ptr<TilingSetRasterQueue> active_queue_;
     scoped_ptr<TilingSetRasterQueue> pending_queue_;
     bool has_both_layers_;
 
     // Set of returned tiles (excluding the current one) for DCHECKing.
     std::set<const Tile*> returned_tiles_for_debug_;
   };
 
-  RasterTilePriorityQueue();
-  ~RasterTilePriorityQueue();
+  RasterTilePriorityQueueAll();
+  ~RasterTilePriorityQueueAll() override;
+
+  bool IsEmpty() const override;
+  Tile* Top() override;
+  void Pop() override;
+
+ private:
+  friend class RasterTilePriorityQueue;
 
   void Build(const std::vector<PictureLayerImpl::Pair>& paired_layers,
-             TreePriority tree_priority,
-             Type type);
-  void Reset();
+             TreePriority tree_priority);
 
-  bool IsEmpty() const;
-  Tile* Top();
-  void Pop();
-
- private:
   // TODO(vmpstr): This is potentially unnecessary if it becomes the case that
   // PairedTilingSetQueue is fast enough to copy. In that case, we can use
   // objects directly (ie std::vector<PairedTilingSetQueue>.
   ScopedPtrVector<PairedTilingSetQueue> paired_queues_;
   TreePriority tree_priority_;
-
-  DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueue);
 };

[danakj, 2015/01/22 20:24:16]

DISALLOW_COPY_AND_ASSIGN

[vmpstr, 2015/01/22 22:44:35]

There's a disallow in the base class, does one need to be here as well?

[danakj, 2015/01/22 22:54:58]

Put it everywhere you can :)

[vmpstr, 2015/01/22 23:01:10]

Done.

 
 }  // namespace cc
 
-#endif  // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
+#endif  // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_