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

Unified Diff: content/browser/renderer_host/media/video_capture_buffer_pool.cc

Issue 1468063002: Remove ScopedVector from video_capture_buffer_pool (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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_buffer_pool.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index 76cc9b6bf0fefc4655913b88a4a86d4905372458..0d664285ec9f9b7086629edbc555ab932f31b535 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
#include "base/stl_util.h"
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
#include "content/public/browser/browser_thread.h"
@@ -65,7 +64,8 @@ class GpuMemoryBufferBufferHandle final
: public VideoCaptureBufferPool::BufferHandle {
public:
GpuMemoryBufferBufferHandle(const gfx::Size& dimensions,
- ScopedVector<gfx::GpuMemoryBuffer>* gmbs)
+ std::vector<
+ scoped_ptr<gfx::GpuMemoryBuffer>>* gmbs)
: dimensions_(dimensions), gmbs_(gmbs) {
DCHECK(gmbs);
}
@@ -93,7 +93,7 @@ class GpuMemoryBufferBufferHandle final
private:
const gfx::Size dimensions_;
- ScopedVector<gfx::GpuMemoryBuffer>* const gmbs_;
+ std::vector<scoped_ptr<gfx::GpuMemoryBuffer>>* const gmbs_;
};
// Tracker specifics for SharedMemory.
@@ -155,7 +155,7 @@ class VideoCaptureBufferPool::GpuMemoryBufferTracker final : public Tracker {
private:
gfx::Size dimensions_;
// Owned references to GpuMemoryBuffers.
- ScopedVector<gfx::GpuMemoryBuffer> gpu_memory_buffers_;
+ std::vector<scoped_ptr<gfx::GpuMemoryBuffer>> gpu_memory_buffers_;
};
VideoCaptureBufferPool::SharedMemTracker::SharedMemTracker() : Tracker() {}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698