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

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: rebase Created 7 years, 11 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
« no previous file with comments | « webkit/media/android/webmediaplayer_in_process_android.h ('k') | webkit/media/webmediaplayer_ms.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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);
« no previous file with comments | « webkit/media/android/webmediaplayer_in_process_android.h ('k') | webkit/media/webmediaplayer_ms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698