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

Unified Diff: cc/output/bsp_tree.h

Issue 1441613002: cc: Remove ScopedPtrDeque. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/cc.gyp ('k') | cc/output/bsp_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/bsp_tree.h
diff --git a/cc/output/bsp_tree.h b/cc/output/bsp_tree.h
index 29c8605b9b4fd514ec208a0aac209f7cad469094..0a0b94845643dfc25beb9a855f398aede5ff023c 100644
--- a/cc/output/bsp_tree.h
+++ b/cc/output/bsp_tree.h
@@ -5,10 +5,10 @@
#ifndef CC_OUTPUT_BSP_TREE_H_
#define CC_OUTPUT_BSP_TREE_H_
+#include <deque>
#include <vector>
#include "base/memory/scoped_ptr.h"
-#include "cc/base/scoped_ptr_deque.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/output/bsp_compare_result.h"
#include "cc/quads/draw_polygon.h"
@@ -31,7 +31,7 @@ struct BspNode {
class CC_EXPORT BspTree {
public:
- explicit BspTree(ScopedPtrDeque<DrawPolygon>* list);
+ explicit BspTree(std::deque<scoped_ptr<DrawPolygon>>* list);
scoped_ptr<BspNode>& root() { return root_; }
template <typename ActionHandlerType>
@@ -47,7 +47,7 @@ class CC_EXPORT BspTree {
scoped_ptr<BspNode> root_;
void FromList(ScopedPtrVector<DrawPolygon>* list);
- void BuildTree(BspNode* node, ScopedPtrDeque<DrawPolygon>* data);
+ void BuildTree(BspNode* node, std::deque<scoped_ptr<DrawPolygon>>* data);
template <typename ActionHandlerType>
void WalkInOrderAction(ActionHandlerType* action_handler,
« no previous file with comments | « cc/cc.gyp ('k') | cc/output/bsp_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698