Adds GeolocationPermissionsBridge.
diff --git a/WebKit/Android.mk b/WebKit/Android.mk
index e4b739a..5e8bdbb 100644
--- a/WebKit/Android.mk
+++ b/WebKit/Android.mk
@@ -33,6 +33,7 @@
\
android/icu/unicode/ucnv.cpp \
\
+ android/jni/GeolocationPermissionsBridge.cpp \
android/jni/JavaBridge.cpp \
android/jni/JavaSharedClient.cpp \
android/jni/PictureSet.cpp \
diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
new file mode 100755
index 0000000..ddcca5d
--- /dev/null
+++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2009, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <JNIHelp.h> // For jniRegisterNativeMethods
+#include "GeolocationPermissions.h"
+#include "WebCoreJni.h" // For to_string
+
+
+/**
+ * This file provides a set of functions to bridge between the Java and C++
+ * GeolocationPermissions classes. The java GeolocationPermissions object calls
+ * the functions provided here, which in turn call static methods on the C++
+ * GeolocationPermissions class.
+ */
+
+namespace android {
+
+static jobject getOrigins(JNIEnv* env, jobject obj)
+{
+ GeolocationPermissions::OriginSet origins = GeolocationPermissions::getOrigins();
+
+ jclass setClass = env->FindClass("java/util/HashSet");
+ jmethodID constructor = env->GetMethodID(setClass, "<init>", "()V");
+ jmethodID addMethod = env->GetMethodID(setClass, "add", "(Ljava/lang/Object;)Z");
+ jobject set = env->NewObject(setClass, constructor);
+
+ GeolocationPermissions::OriginSet::const_iterator end = origins.end();
+ for (GeolocationPermissions::OriginSet::const_iterator iter = origins.begin(); iter != end; ++iter) {
+ jstring originString = env->NewString(iter->characters(), iter->length());
+ env->CallBooleanMethod(set, addMethod, originString);
+ env->DeleteLocalRef(originString);
+ }
+ return set;
+}
+
+static bool getAllowed(JNIEnv* env, jobject obj, jstring origin)
+{
+ WebCore::String originString = to_string(env, origin);
+ return GeolocationPermissions::getAllowed(originString);
+}
+
+static void clear(JNIEnv* env, jobject obj, jstring origin)
+{
+ WebCore::String originString = to_string(env, origin);
+ GeolocationPermissions::clear(originString);
+}
+
+static void clearAll(JNIEnv* env, jobject obj)
+{
+ GeolocationPermissions::clearAll();
+}
+
+/*
+ * JNI registration
+ */
+static JNINativeMethod gGeolocationPermissionsMethods[] = {
+ { "nativeGetOrigins", "()Ljava/util/Set;",
+ (void*) getOrigins },
+ { "nativeGetAllowed", "(Ljava/lang/String;)Z",
+ (void*) getAllowed },
+ { "nativeClear", "(Ljava/lang/String;)V",
+ (void*) clear },
+ { "nativeClearAll", "()V",
+ (void*) clearAll }
+};
+
+int register_geolocation_permissions(JNIEnv* env)
+{
+ const char* kGeolocationPermissionsClass = "android/webkit/GeolocationPermissions";
+ jclass geolocationPermissions = env->FindClass(kGeolocationPermissionsClass);
+ LOG_ASSERT(geolocationPermissions, "Unable to find class");
+
+ return jniRegisterNativeMethods(env, kGeolocationPermissionsClass,
+ gGeolocationPermissionsMethods, NELEM(gGeolocationPermissionsMethods));
+}
+
+}
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index c6b0022..3a29f43 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -41,10 +41,10 @@
extern int register_websettings(JNIEnv*);
extern int register_webview(JNIEnv*);
extern int register_webcorejni(JNIEnv*);
-
#if ENABLE(DATABASE)
extern int register_webstorage(JNIEnv*);
#endif
+extern int register_geolocation_permissions(JNIEnv*);
}
@@ -65,7 +65,8 @@
#if ENABLE(DATABASE)
{ "WebStorage", android::register_webstorage },
#endif
- { "WebView", android::register_webview }
+ { "WebView", android::register_webview },
+ { "GeolocationPermissions", android::register_geolocation_permissions }
};
EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
