| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index a090324b8203e567ae711c74d5c8dae81d737d8c..0aa4e8f42ed7d3394c60ad9d8e99de243429a27b 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CC_OUTPUT_GL_RENDERER_H_
|
| #define CC_OUTPUT_GL_RENDERER_H_
|
|
|
| +#include <deque>
|
| +
|
| #include "base/cancelable_callback.h"
|
| #include "cc/base/cc_export.h"
|
| -#include "cc/base/scoped_ptr_deque.h"
|
| #include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/output/direct_renderer.h"
|
| #include "cc/output/gl_renderer_draw_cache.h"
|
| @@ -504,8 +505,8 @@ class CC_EXPORT GLRenderer : public DirectRenderer {
|
| scoped_ptr<ResourceProvider::ScopedWriteLockGL> current_framebuffer_lock_;
|
|
|
| class SyncQuery;
|
| - ScopedPtrDeque<SyncQuery> pending_sync_queries_;
|
| - ScopedPtrDeque<SyncQuery> available_sync_queries_;
|
| + std::deque<scoped_ptr<SyncQuery>> pending_sync_queries_;
|
| + std::deque<scoped_ptr<SyncQuery>> available_sync_queries_;
|
| scoped_ptr<SyncQuery> current_sync_query_;
|
| bool use_sync_query_;
|
| bool use_blend_equation_advanced_;
|
|
|