webkit/compositor_bindings/web_video_layer_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/compositor_bindings/web_video_layer_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: gyp-depend-on-media+androidfix 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_to_ccvideo_frame_provider.cc ('K') | « webkit/compositor_bindings/web_video_layer_impl.h ('k') | webkit/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/compositor_bindings/web_video_layer_impl.cc

diff --git a/webkit/compositor_bindings/web_video_layer_impl.cc b/webkit/compositor_bindings/web_video_layer_impl.cc

index 4785f3e98b0fc17e48007c499a11c245a0498caf..43fd2b2d284c9f7b5217d0bf2a316d3b74439267 100644

--- a/webkit/compositor_bindings/web_video_layer_impl.cc

+++ b/webkit/compositor_bindings/web_video_layer_impl.cc

@@ -7,15 +7,14 @@

#include "base/bind.h"

#include "cc/video_layer.h"

#include "webkit/compositor_bindings/web_layer_impl.h"

+#include "webkit/compositor_bindings/web_to_ccvideo_frame_provider.h"

#include "webkit/media/webvideoframe_impl.h"

namespace WebKit {

-WebVideoLayerImpl::WebVideoLayerImpl(WebVideoFrameProvider* provider)

- : m_layer(new WebLayerImpl(

- cc::VideoLayer::create(

- provider,

- base::Bind(webkit_media::WebVideoFrameImpl::toVideoFrame))))

+WebVideoLayerImpl::WebVideoLayerImpl(WebVideoFrameProvider* web_provider)

+ : m_providerAdapter(webkit::WebToCCVideoFrameProvider::Create(web_provider))

+ , m_layer(new WebLayerImpl(cc::VideoLayer::create(m_providerAdapter.get())))

jamesr 2013/01/04 18:39:40 chromium style is to put this comma at the end of

danakj 2013/01/04 19:47:34 None of this file is chromium style yet :/

{

}