diff options
Diffstat (limited to 'Source/WebKit/android/jni')
-rw-r--r-- | Source/WebKit/android/jni/WebCoreJniOnLoad.cpp | 7 | ||||
-rw-r--r-- | Source/WebKit/android/jni/WebSettings.cpp | 11 |
2 files changed, 17 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 }, 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); |