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

Unified Diff: cc/resources/resource_provider_unittest.cc

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
Index: cc/resources/resource_provider_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 2c567f719cd3739166d7b31d9268d54e3d4bc377..b608b584b6032285a0ca89d01c07e82720f3c865 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -5,6 +5,7 @@
#include "cc/resources/resource_provider.h"
#include <algorithm>
+#include <deque>
#include <map>
#include <set>
#include <vector>
@@ -13,7 +14,6 @@
#include "base/containers/hash_tables.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
-#include "cc/base/scoped_ptr_deque.h"
#include "cc/output/output_surface.h"
#include "cc/resources/returned_resource.h"
#include "cc/resources/shared_bitmap_manager.h"
@@ -357,7 +357,8 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM];
scoped_refptr<TestTexture> texture;
};
- typedef ScopedPtrDeque<PendingProduceTexture> PendingProduceTextureList;
+ typedef std::deque<scoped_ptr<PendingProduceTexture>>
danakj 2015/11/13 19:54:02 nit: using instead of typedef but probably kill t
vmpstr 2015/11/13 23:15:38 Done.
+ PendingProduceTextureList;
ContextSharedData* shared_data_;
gpu::SyncToken last_waited_sync_token_;
PendingProduceTextureList pending_produce_textures_;

Powered by Google App Engine
This is Rietveld 408576698