Enables Geolocation on Android.

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index f02dfa3..1b3e248 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -652,6 +652,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/android/EventLoopAndroid.cpp \
        platform/android/FileChooserAndroid.cpp \
        platform/android/FileSystemAndroid.cpp \
+       platform/android/GeolocationServiceAndroid.cpp \
        platform/android/KeyEventAndroid.cpp \
        platform/android/LocalizedStringsAndroid.cpp \
        platform/android/PopupMenuAndroid.cpp \

diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk
index 137ff44..89fbaca 100644 (file)
--- a/WebCore/Android.v8.mk
+++ b/WebCore/Android.v8.mk
@@ -513,6 +513,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/android/EventLoopAndroid.cpp \
        platform/android/FileChooserAndroid.cpp \
        platform/android/FileSystemAndroid.cpp \
+       platform/android/GeolocationServiceAndroid.cpp \
        platform/android/KeyEventAndroid.cpp \
        platform/android/LocalizedStringsAndroid.cpp \
        platform/android/PopupMenuAndroid.cpp \

diff --git a/WebCore/config.h b/WebCore/config.h
index 1529a9a..551d99f 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -135,6 +135,12 @@
 #define ENABLE_ARCHIVE 0 // ANDROID addition: allow web archive to be disabled
 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1
 #define ENABLE_TOUCH_EVENTS 1
+#undef ENABLE_GEOLOCATION
+#if USE(V8)
+// Geolocation does not work with V8 yet.
+#else
+#define ENABLE_GEOLOCATION 1
+#endif
 #endif  // PLATFORM(ANDROID)
 
 #ifdef __cplusplus

diff --git a/WebCore/platform/android/GeolocationServiceAndroid.cpp b/WebCore/platform/android/GeolocationServiceAndroid.cpp
new file mode 100644 (file)
index 0000000..17807b3
--- /dev/null
+++ b/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -0,0 +1,35 @@
+/*
+ * 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 "GeolocationService.h"
+
+namespace WebCore {
+
+GeolocationService* GeolocationService::create(GeolocationServiceClient*) {
+    // TODO(steveblock): Implement Geolocation on Android.
+    return 0;
+}
+
+}  // namespace WebCore