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

Unified Diff: content/renderer/pepper/video_decoder_shim.h

Issue 1457963002: Use scoped_ptr instead of linked_ptr from /content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile error 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
Index: content/renderer/pepper/video_decoder_shim.h
diff --git a/content/renderer/pepper/video_decoder_shim.h b/content/renderer/pepper/video_decoder_shim.h
index 18e3baa7c1730d48233d7f8c4bc4b78653bf5060..deefdced66fbede47aabdb24d812fef420c7a923 100644
--- a/content/renderer/pepper/video_decoder_shim.h
+++ b/content/renderer/pepper/video_decoder_shim.h
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
-#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "gpu/command_buffer/common/mailbox.h"
@@ -111,7 +110,7 @@ class VideoDecoderShim : public media::VideoDecodeAccelerator {
CompletedDecodeQueue completed_decodes_;
// Queue of decoded frames that await rgb->yuv conversion.
- typedef std::queue<linked_ptr<PendingFrame> > PendingFrameQueue;
+ typedef std::queue<scoped_ptr<PendingFrame>> PendingFrameQueue;
PendingFrameQueue pending_frames_;
// The optimal number of textures to allocate for decoder_impl_.
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698