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

Unified Diff: cc/output/gl_renderer.cc

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (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
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 1677de1ccc083300f6b81dc0bac0e10da0dd545b..2b1b1f28725c55631ce1e89dec3a931a5b85b0b6 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -377,7 +377,8 @@ GLRenderer::GLRenderer(RendererClient* client,
GLRenderer::~GLRenderer() {
while (!pending_async_read_pixels_.empty()) {
- PendingAsyncReadPixels* pending_read = pending_async_read_pixels_.back();
+ PendingAsyncReadPixels* pending_read =
+ pending_async_read_pixels_.back().get();
pending_read->finished_read_pixels_callback.Cancel();
pending_async_read_pixels_.pop_back();
}
@@ -2833,7 +2834,7 @@ void GLRenderer::FinishedReadback(unsigned source_buffer,
++iter;
DCHECK(iter != reverse_end);
- PendingAsyncReadPixels* current_read = *iter;
+ PendingAsyncReadPixels* current_read = iter->get();
uint8* src_pixels = NULL;
scoped_ptr<SkBitmap> bitmap;
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698