webkit/media/webmediaplayer_impl.cc - Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/

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: webkit/media/webmediaplayer_impl.cc

Issue 11754003: Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed crashes Created 7 years, 12 months 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

« webkit/compositor_bindings/web_video_layer_impl.h ('K') | « webkit/media/android/webmediaplayer_in_process_android.h ('k') | webkit/media/webmediaplayer_ms.h » ('j') | webkit/media/webvideoframe_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/media/webmediaplayer_impl.cc

diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc

index ded461a1cfd21ad6bda8e42f124ed1f95b437006..f65d67537fb39913457af032c90623e9cb9cbcb6 100644

--- a/webkit/media/webmediaplayer_impl.cc

+++ b/webkit/media/webmediaplayer_impl.cc

@@ -25,7 +25,6 @@

#include "media/filters/chunk_demuxer.h"

#include "media/filters/video_renderer_base.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"

-#include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"

@@ -644,9 +643,8 @@ void WebMediaPlayerImpl::putCurrentFrame(

UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", true);

}

if (web_video_frame) {

- scoped_refptr<media::VideoFrame> video_frame(

- WebVideoFrameImpl::toVideoFrame(web_video_frame));

- proxy_->PutCurrentFrame(video_frame);

+ WebVideoFrameImpl* impl = static_cast<WebVideoFrameImpl*>(web_video_frame);

+ proxy_->PutCurrentFrame(impl->video_frame);

delete web_video_frame;

} else {

proxy_->PutCurrentFrame(NULL);