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/WebSettings.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/WebSettings.cpp')
-rw-r--r-- | Source/WebKit/android/jni/WebSettings.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 6aff63e..4290ca3 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -53,6 +53,7 @@ #include "WebCoreJni.h" #include "WorkerContextExecutionProxy.h" #include "WebRequestContext.h" +#include "WebSocket.h" #include "WebViewCore.h" #include <JNIHelp.h> @@ -102,6 +103,9 @@ struct FieldIds { #if ENABLE(DATABASE) mDatabaseEnabled = env->GetFieldID(clazz, "mDatabaseEnabled", "Z"); #endif +#if ENABLE(WEB_SOCKETS) + mWebSocketsEnabled = env->GetFieldID(clazz, "mWebSocketsEnabled", "Z"); +#endif #if ENABLE(DOM_STORAGE) mDomStorageEnabled = env->GetFieldID(clazz, "mDomStorageEnabled", "Z"); #endif @@ -265,6 +269,9 @@ struct FieldIds { #if ENABLE(DATABASE) jfieldID mDatabaseEnabled; #endif +#if ENABLE(WEB_SOCKETS) + jfieldID mWebSocketsEnabled; +#endif #if ENABLE(DOM_STORAGE) jfieldID mDomStorageEnabled; #endif @@ -546,6 +553,10 @@ public: } } #endif +#if ENABLE(WEB_SOCKETS) + flag = env->GetBooleanField(obj, gFieldIds->mWebSocketsEnabled); + WebCore::WebSocket::setIsAvailable(flag); +#endif #if ENABLE(DOM_STORAGE) flag = env->GetBooleanField(obj, gFieldIds->mDomStorageEnabled); s->setLocalStorageEnabled(flag); |