webkit/media/webkit_media.gypi - Issue 10073016: Upstream WebMediaPlayerAndroid as WebKit::WebMediaPlayer implementation on android.

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/webkit_media.gypi

Issue 10073016: Upstream WebMediaPlayerAndroid as WebKit::WebMediaPlayer implementation on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressing feedbacks Created 8 years, 8 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/media/android/webmediaplayer_proxy_android.cc ('K') | « webkit/media/android/webmediaplayer_proxy_android.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | webkit/media/webmediaplayer_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/media/webkit_media.gypi

diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi

index fb62d197c422a87e32656788a73f7bded30a6ac4..dfb6826c219419cf4109c60531c5cfc6ee4cfd3e 100644

--- a/webkit/media/webkit_media.gypi

+++ b/webkit/media/webkit_media.gypi

@@ -15,6 +15,10 @@

'sources': [

'android/audio_decoder_android.cc',

+ 'android/webmediaplayer_android.cc',

+ 'android/webmediaplayer_android.h',

+ 'android/webmediaplayer_proxy_android.cc',

+ 'android/webmediaplayer_proxy_android.h',

'active_loader.cc',

'active_loader.h',

'audio_decoder.cc',

@@ -34,6 +38,7 @@

'webmediaplayer_impl.h',

'webmediaplayer_proxy.cc',

'webmediaplayer_proxy.h',

+ 'webmediaplayer_util.h',

'webvideoframe_impl.cc',

'webvideoframe_impl.h',