diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-10-18 10:26:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:26:54 -0700 |
| commit | 7fc27f0903bfc72035faff876d0673c9064085ac (patch) | |
| tree | e60b0352b617d40a9cfe4b4f02fedc7ff3af5f9a /WebKit/android/jni/WebCoreJniOnLoad.cpp | |
| parent | fdbac3da7f70871a0f62e593fc068844d1f7ae84 (diff) | |
| parent | 3d57c253bfa22c17c5f38a70e162a6115a1809b6 (diff) | |
| download | external_webkit-7fc27f0903bfc72035faff876d0673c9064085ac.zip external_webkit-7fc27f0903bfc72035faff876d0673c9064085ac.tar.gz external_webkit-7fc27f0903bfc72035faff876d0673c9064085ac.tar.bz2 | |
am 3d57c253: Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Merge commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6' into gingerbread-plus-aosp
* commit '3d57c253bfa22c17c5f38a70e162a6115a1809b6':
Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
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 }; |