Chromium Code Reviews| 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..c803146639129bfa9642409353543130942e95ad 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" |
| @@ -182,10 +182,8 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { |
| uint32 sync_point = shared_data_->InsertSyncPoint(); |
| // Commit the produceTextureCHROMIUM calls at this point, so that |
| // they're associated with the sync point. |
| - for (PendingProduceTextureList::iterator it = |
| - pending_produce_textures_.begin(); |
| - it != pending_produce_textures_.end(); |
| - ++it) { |
| + for (auto it = pending_produce_textures_.begin(); |
|
danakj
2015/11/13 23:41:06
um, actually not sure why not use range-based for
vmpstr
2015/11/13 23:50:49
Yep, changed it to that. A lot of these changes we
|
| + it != pending_produce_textures_.end(); ++it) { |
| shared_data_->ProduceTexture((*it)->mailbox, gpu::SyncToken(sync_point), |
| (*it)->texture); |
| } |
| @@ -357,10 +355,9 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { |
| GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM]; |
| scoped_refptr<TestTexture> texture; |
| }; |
| - typedef ScopedPtrDeque<PendingProduceTexture> PendingProduceTextureList; |
| ContextSharedData* shared_data_; |
| gpu::SyncToken last_waited_sync_token_; |
| - PendingProduceTextureList pending_produce_textures_; |
| + std::deque<scoped_ptr<PendingProduceTexture>> pending_produce_textures_; |
| }; |
| void GetResourcePixels(ResourceProvider* resource_provider, |