Index: cc/output/gl_renderer.h |
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h |
index 0aa4e8f42ed7d3394c60ad9d8e99de243429a27b..d9265ebac384f0fe4f574aa144ce7e6c7105eff0 100644 |
--- a/cc/output/gl_renderer.h |
+++ b/cc/output/gl_renderer.h |
@@ -9,7 +9,6 @@ |
#include "base/cancelable_callback.h" |
#include "cc/base/cc_export.h" |
-#include "cc/base/scoped_ptr_vector.h" |
danakj
2015/11/17 01:12:17
include vector
|
#include "cc/output/direct_renderer.h" |
#include "cc/output/gl_renderer_draw_cache.h" |
#include "cc/output/program_binding.h" |
@@ -259,7 +258,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { |
void ScheduleOverlays(DrawingFrame* frame); |
- typedef ScopedPtrVector<ResourceProvider::ScopedReadLockGL> |
+ typedef std::vector<scoped_ptr<ResourceProvider::ScopedReadLockGL>> |
danakj
2015/11/17 01:12:17
bleh, typedefs. at least make this using = if you'
vmpstr
2015/11/17 23:26:24
Done.
|
OverlayResourceLockList; |
OverlayResourceLockList pending_overlay_resources_; |
OverlayResourceLockList in_use_overlay_resources_; |
@@ -500,7 +499,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { |
int highp_threshold_cache_; |
struct PendingAsyncReadPixels; |
- ScopedPtrVector<PendingAsyncReadPixels> pending_async_read_pixels_; |
+ std::vector<scoped_ptr<PendingAsyncReadPixels>> pending_async_read_pixels_; |
scoped_ptr<ResourceProvider::ScopedWriteLockGL> current_framebuffer_lock_; |