Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1342)

Unified Diff: cc/resources/raster_tile_priority_queue_all.h

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/raster_tile_priority_queue.cc ('k') | cc/resources/raster_tile_priority_queue_all.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/raster_tile_priority_queue_all.h
diff --git a/cc/resources/raster_tile_priority_queue.h b/cc/resources/raster_tile_priority_queue_all.h
similarity index 55%
copy from cc/resources/raster_tile_priority_queue.h
copy to cc/resources/raster_tile_priority_queue_all.h
index 65c924798a8338de2e6002254a2c481f8fc742ca..c2b8910c00611daa04831f9fe54e12d150b7b341 100644
--- a/cc/resources/raster_tile_priority_queue.h
+++ b/cc/resources/raster_tile_priority_queue_all.h
@@ -1,9 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
-#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>
@@ -11,25 +11,19 @@
#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"
+#include "cc/resources/tiling_set_raster_queue_all.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;
@@ -41,44 +35,44 @@ class CC_EXPORT RasterTilePriorityQueue {
scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
- const TilingSetRasterQueue* active_queue() const {
+ const TilingSetRasterQueueAll* active_queue() const {
return active_queue_.get();
}
- const TilingSetRasterQueue* pending_queue() const {
+ const TilingSetRasterQueueAll* pending_queue() const {
return pending_queue_.get();
}
private:
- scoped_ptr<TilingSetRasterQueue> active_queue_;
- scoped_ptr<TilingSetRasterQueue> pending_queue_;
+ scoped_ptr<TilingSetRasterQueueAll> active_queue_;
+ scoped_ptr<TilingSetRasterQueueAll> 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();
-
- void Build(const std::vector<PictureLayerImpl::Pair>& paired_layers,
- TreePriority tree_priority,
- Type type);
- void Reset();
+ RasterTilePriorityQueueAll();
+ ~RasterTilePriorityQueueAll() override;
- bool IsEmpty() const;
- Tile* Top();
- void Pop();
+ 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);
+
// 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);
+ DISALLOW_COPY_AND_ASSIGN(RasterTilePriorityQueueAll);
};
} // namespace cc
-#endif // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_H_
+#endif // CC_RESOURCES_RASTER_TILE_PRIORITY_QUEUE_ALL_H_
« no previous file with comments | « cc/resources/raster_tile_priority_queue.cc ('k') | cc/resources/raster_tile_priority_queue_all.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698