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

Side by Side Diff: cc/output/gl_renderer.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 unified diff | Download patch
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_OUTPUT_GL_RENDERER_H_ 5 #ifndef CC_OUTPUT_GL_RENDERER_H_
6 #define CC_OUTPUT_GL_RENDERER_H_ 6 #define CC_OUTPUT_GL_RENDERER_H_
7 7
8 #include <deque>
9
8 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
9 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
10 #include "cc/base/scoped_ptr_deque.h"
11 #include "cc/base/scoped_ptr_vector.h" 12 #include "cc/base/scoped_ptr_vector.h"
12 #include "cc/output/direct_renderer.h" 13 #include "cc/output/direct_renderer.h"
13 #include "cc/output/gl_renderer_draw_cache.h" 14 #include "cc/output/gl_renderer_draw_cache.h"
14 #include "cc/output/program_binding.h" 15 #include "cc/output/program_binding.h"
15 #include "cc/output/renderer.h" 16 #include "cc/output/renderer.h"
16 #include "cc/quads/debug_border_draw_quad.h" 17 #include "cc/quads/debug_border_draw_quad.h"
17 #include "cc/quads/io_surface_draw_quad.h" 18 #include "cc/quads/io_surface_draw_quad.h"
18 #include "cc/quads/render_pass_draw_quad.h" 19 #include "cc/quads/render_pass_draw_quad.h"
19 #include "cc/quads/solid_color_draw_quad.h" 20 #include "cc/quads/solid_color_draw_quad.h"
20 #include "cc/quads/tile_draw_quad.h" 21 #include "cc/quads/tile_draw_quad.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 TexturedQuadDrawCache draw_cache_; 498 TexturedQuadDrawCache draw_cache_;
498 int highp_threshold_min_; 499 int highp_threshold_min_;
499 int highp_threshold_cache_; 500 int highp_threshold_cache_;
500 501
501 struct PendingAsyncReadPixels; 502 struct PendingAsyncReadPixels;
502 ScopedPtrVector<PendingAsyncReadPixels> pending_async_read_pixels_; 503 ScopedPtrVector<PendingAsyncReadPixels> pending_async_read_pixels_;
503 504
504 scoped_ptr<ResourceProvider::ScopedWriteLockGL> current_framebuffer_lock_; 505 scoped_ptr<ResourceProvider::ScopedWriteLockGL> current_framebuffer_lock_;
505 506
506 class SyncQuery; 507 class SyncQuery;
507 ScopedPtrDeque<SyncQuery> pending_sync_queries_; 508 std::deque<scoped_ptr<SyncQuery>> pending_sync_queries_;
508 ScopedPtrDeque<SyncQuery> available_sync_queries_; 509 std::deque<scoped_ptr<SyncQuery>> available_sync_queries_;
509 scoped_ptr<SyncQuery> current_sync_query_; 510 scoped_ptr<SyncQuery> current_sync_query_;
510 bool use_sync_query_; 511 bool use_sync_query_;
511 bool use_blend_equation_advanced_; 512 bool use_blend_equation_advanced_;
512 bool use_blend_equation_advanced_coherent_; 513 bool use_blend_equation_advanced_coherent_;
513 514
514 SkBitmap on_demand_tile_raster_bitmap_; 515 SkBitmap on_demand_tile_raster_bitmap_;
515 ResourceId on_demand_tile_raster_resource_id_; 516 ResourceId on_demand_tile_raster_resource_id_;
516 BoundGeometry bound_geometry_; 517 BoundGeometry bound_geometry_;
517 DISALLOW_COPY_AND_ASSIGN(GLRenderer); 518 DISALLOW_COPY_AND_ASSIGN(GLRenderer);
518 }; 519 };
519 520
520 } // namespace cc 521 } // namespace cc
521 522
522 #endif // CC_OUTPUT_GL_RENDERER_H_ 523 #endif // CC_OUTPUT_GL_RENDERER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698