diff options
| author | Oleg Smirnov <oleg.smirnov@lge.com> | 2013-02-11 18:35:45 +0400 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-02-23 19:21:07 +0530 |
| commit | 6d89cd5a29bb59264bb009d24b27e98e003381d7 (patch) | |
| tree | d4424eefb9c549398b949610c7f689d0a1fb3a8f /Source/WebKit/android/jni/WebCoreJniOnLoad.cpp | |
| parent | 016661c890caf59f18cee0113582a099aec0c1fc (diff) | |
| download | external_webkit-6d89cd5a29bb59264bb009d24b27e98e003381d7.zip external_webkit-6d89cd5a29bb59264bb009d24b27e98e003381d7.tar.gz external_webkit-6d89cd5a29bb59264bb009d24b27e98e003381d7.tar.bz2 | |
[HTML5] Implementation of WebSockets (WebKit).
Added binding to android port for Html5 WebSockets.
Added external API for enabling\disabling from browser.
SSL Web Sockets are not implemented in the current version.
Change-Id: Ie37569107c429492ee91b153939ab1ef4e07435e
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreJniOnLoad.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreJniOnLoad.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp index ec052f1..a62e55d 100644 --- a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -83,6 +83,9 @@ extern int registerViewStateSerializer(JNIEnv*); #if ENABLE(DATABASE) extern int registerWebStorage(JNIEnv*); #endif +#if ENABLE(WEB_SOCKETS) +extern int registerWebSockets(JNIEnv*); +#endif extern int registerGeolocationPermissions(JNIEnv*); extern int registerMockGeolocation(JNIEnv*); #if ENABLE(VIDEO) @@ -92,7 +95,6 @@ extern int registerMediaPlayerVideo(JNIEnv*); extern int registerDeviceMotionAndOrientationManager(JNIEnv*); extern int registerCookieManager(JNIEnv*); extern int registerCacheManager(JNIEnv*); - } struct RegistrationMethod { @@ -110,6 +112,9 @@ static RegistrationMethod gWebCoreRegMethods[] = { #if ENABLE(DATABASE) { "WebStorage", android::registerWebStorage }, #endif +#if ENABLE(WEB_SOCKETS) + { "WebSockets", android::registerWebSockets }, +#endif { "WebView", android::registerWebView }, { "ViewStateSerializer", android::registerViewStateSerializer }, { "GeolocationPermissions", android::registerGeolocationPermissions }, |