content/renderer/pepper/video_decoder_shim.cc - Issue 1457963002: Use scoped_ptr instead of linked_ptr from /content/renderer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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: 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

« content/renderer/pepper/event_conversion.cc ('K') | « content/renderer/pepper/video_decoder_shim.h ('k') | content/renderer/presentation/presentation_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/video_decoder_shim.cc

diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc

index 8efb3d80c9831b61c0b2918449e5252315a33847..570a81fd95a9fe0234bf2ffdbd35f56a976f9db1 100644

--- a/content/renderer/pepper/video_decoder_shim.cc

+++ b/content/renderer/pepper/video_decoder_shim.cc

@@ -1043,7 +1043,7 @@ void VideoDecoderShim::OnOutputComplete(scoped_ptr<PendingFrame> frame) {

texture_size_ = frame->video_frame->coded_size();

}

- pending_frames_.push(linked_ptr<PendingFrame>(frame.release()));

+ pending_frames_.push(std::move(frame));

SendPictures();

}

@@ -1052,7 +1052,7 @@ void VideoDecoderShim::SendPictures() {

DCHECK(RenderThreadImpl::current());

DCHECK(host_);

while (!pending_frames_.empty() && !available_textures_.empty()) {

- const linked_ptr<PendingFrame>& frame = pending_frames_.front();

+ const scoped_ptr<PendingFrame>& frame = pending_frames_.front();

TextureIdSet::iterator it = available_textures_.begin();

uint32_t texture_id = *it;