diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-02-02 13:11:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-18 13:07:05 +0100 |
| commit | 3d57c253bfa22c17c5f38a70e162a6115a1809b6 (patch) | |
| tree | b17bd2355f8f57bd81cdac419a2c362194fd9ab1 /WebKit/android/jni/WebCoreJniOnLoad.cpp | |
| parent | 5013a3fb99f9ca1c7be4319cdebc7cddcaa56d7c (diff) | |
| download | external_webkit-3d57c253bfa22c17c5f38a70e162a6115a1809b6.zip external_webkit-3d57c253bfa22c17c5f38a70e162a6115a1809b6.tar.gz external_webkit-3d57c253bfa22c17c5f38a70e162a6115a1809b6.tar.bz2 | |
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Cherry pick to Gingerbread, DO NOT MERGE!
Bug:3101402
Change-Id: Idbfb0efcc777f9354fcf88df32105ca9e50a24cd
Diffstat (limited to 'WebKit/android/jni/WebCoreJniOnLoad.cpp')
| -rw-r--r-- | WebKit/android/jni/WebCoreJniOnLoad.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index b5bf9dd..86248db 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -82,7 +82,8 @@ extern int register_webstorage(JNIEnv*); extern int register_geolocation_permissions(JNIEnv*); extern int register_mock_geolocation(JNIEnv*); #if ENABLE(VIDEO) -extern int register_mediaplayer(JNIEnv*); +extern int register_mediaplayer_audio(JNIEnv*); +extern int register_mediaplayer_video(JNIEnv*); #endif } @@ -107,7 +108,8 @@ static RegistrationMethod gWebCoreRegMethods[] = { { "GeolocationPermissions", android::register_geolocation_permissions }, { "MockGeolocation", android::register_mock_geolocation }, #if ENABLE(VIDEO) - { "HTML5VideoViewProxy", android::register_mediaplayer }, + { "HTML5Audio", android::register_mediaplayer_audio }, + { "HTML5VideoViewProxy", android::register_mediaplayer_video }, #endif }; |