Move GeolocationServiceBridge to WebKit/android/jni and extract Listener interface

Also modify GeolocationServiceBridge to take a WebViewCore rather than a Frame.

This will simplify the transition to client-based implementation, which will
re-use GeolocationServiceBridge.

No functional change.

Bug: 6511338
Change-Id: I2de9dfed51d785c85b40f362f20189f208adf6ec

4 files changed, 15 insertions, 326 deletions

diff --git a/Source/WebCore/platform/android/GeolocationServiceAndroid.cpp b/Source/WebCore/platform/android/GeolocationServiceAndroid.cpp
index 0f07722..9ea0362 100644
--- a/Source/WebCore/platform/android/GeolocationServiceAndroid.cpp
+++ b/Source/WebCore/platform/android/GeolocationServiceAndroid.cpp
@@ -26,12 +26,14 @@
 #include "config.h"
 #include "GeolocationServiceAndroid.h"
 
+#include "Frame.h"
 #include "Geolocation.h"
-#include "GeolocationServiceBridge.h"
 #include "Geoposition.h"
 #include "PositionError.h"
 #include "PositionOptions.h"
 
+#include <WebViewCore.h>
+
 #if PLATFORM(ANDROID)
 // Required for sim-eng build
 #include <math.h>
@@ -39,6 +41,8 @@
 #include <wtf/CurrentTime.h>
 
 using JSC::Bindings::getJNIEnv;
+using android::GeolocationServiceBridge;
+using android::WebViewCore;
 using namespace std;
 
 namespace WebCore {
@@ -89,7 +93,7 @@ bool GeolocationServiceAndroid::startUpdating(PositionOptions* options, bool sus
     // Lazilly create the Java object.
     bool haveJavaBridge = m_javaBridge;
     if (!haveJavaBridge)
-        m_javaBridge.set(new GeolocationServiceBridge(this, frame));
+        m_javaBridge.set(new GeolocationServiceBridge(this, WebViewCore::getWebViewCore(frame->view())));
     ASSERT(m_javaBridge);
 
     // On Android, high power == GPS. Set whether to use GPS before we start the
diff --git a/Source/WebCore/platform/android/GeolocationServiceAndroid.h b/Source/WebCore/platform/android/GeolocationServiceAndroid.h
index 72532f6..47c3ffe 100644
--- a/Source/WebCore/platform/android/GeolocationServiceAndroid.h
+++ b/Source/WebCore/platform/android/GeolocationServiceAndroid.h
@@ -28,37 +28,34 @@
 
 #include "GeolocationService.h"
 #include "Timer.h"
+
+#include <GeolocationServiceBridge.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-// The GeolocationServiceBridge is the bridge to the Java implementation of
-// the Geolocation service. It is an implementation detail of
-// GeolocationServiceAndroid.
-class GeolocationServiceBridge;
-
-class GeolocationServiceAndroid : public GeolocationService {
+class GeolocationServiceAndroid : public GeolocationService, public android::GeolocationServiceBridge::Listener {
 public:
     static GeolocationService* create(GeolocationServiceClient*);
 
     virtual ~GeolocationServiceAndroid() { };
 
+    // GeolocationService
     // ANDROID
     // TODO: Upstream to webkit.org. See https://bugs.webkit.org/show_bug.cgi?id=34082
     virtual bool startUpdating(PositionOptions*, bool suspend);
     virtual void stopUpdating();
-
     virtual Geoposition* lastPosition() const { return m_lastPosition.get(); }
     virtual PositionError* lastError() const { return m_lastError.get(); }
-
     virtual void suspend();
     virtual void resume();
 
-    // Android-specific
-    void newPositionAvailable(PassRefPtr<Geoposition>);
-    void newErrorAvailable(PassRefPtr<PositionError>);
+    // android::GeolocationServiceBridge::Listener
+    virtual void newPositionAvailable(PassRefPtr<Geoposition>);
+    virtual void newErrorAvailable(PassRefPtr<PositionError>);
+
     void timerFired(Timer<GeolocationServiceAndroid>* timer);
 
 private:
@@ -71,7 +68,7 @@ private:
     Timer<GeolocationServiceAndroid> m_timer;
     RefPtr<Geoposition> m_lastPosition;
     RefPtr<PositionError> m_lastError;
-    OwnPtr<GeolocationServiceBridge> m_javaBridge;
+    OwnPtr<android::GeolocationServiceBridge> m_javaBridge;
 };
 
 } // namespace WebCore
diff --git a/Source/WebCore/platform/android/GeolocationServiceBridge.cpp b/Source/WebCore/platform/android/GeolocationServiceBridge.cpp
deleted file mode 100644
index 697b63b..0000000
--- a/Source/WebCore/platform/android/GeolocationServiceBridge.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * 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 THE COPYRIGHT OWNER 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 "GeolocationServiceBridge.h"
-
-#include "Frame.h"
-#include "GeolocationServiceAndroid.h"
-#include "Geoposition.h"
-#include "PositionError.h"
-#include "WebViewCore.h"
-#include <JNIHelp.h>
-
-namespace WebCore {
-
-using JSC::Bindings::getJNIEnv;
-
-static const char* javaGeolocationServiceClassName = "android/webkit/GeolocationService";
-enum javaGeolocationServiceClassMethods {
-    GeolocationServiceMethodInit = 0,
-    GeolocationServiceMethodStart,
-    GeolocationServiceMethodStop,
-    GeolocationServiceMethodSetEnableGps,
-    GeolocationServiceMethodCount,
-};
-static jmethodID javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodCount];
-
-static const JNINativeMethod javaGeolocationServiceClassNativeMethods[] = {
-    { "nativeNewLocationAvailable", "(JLandroid/location/Location;)V",
-        (void*) GeolocationServiceBridge::newLocationAvailable },
-    { "nativeNewErrorAvailable", "(JLjava/lang/String;)V",
-        (void*) GeolocationServiceBridge::newErrorAvailable }
-};
-
-static const char *javaLocationClassName = "android/location/Location";
-enum javaLocationClassMethods {
-    LocationMethodGetLatitude = 0,
-    LocationMethodGetLongitude,
-    LocationMethodHasAltitude,
-    LocationMethodGetAltitude,
-    LocationMethodHasAccuracy,
-    LocationMethodGetAccuracy,
-    LocationMethodHasBearing,
-    LocationMethodGetBearing,
-    LocationMethodHasSpeed,
-    LocationMethodGetSpeed,
-    LocationMethodGetTime,
-    LocationMethodCount,
-};
-static jmethodID javaLocationClassMethodIDs[LocationMethodCount];
-
-GeolocationServiceBridge::GeolocationServiceBridge(ListenerInterface* listener, Frame* frame)
-    : m_listener(listener)
-    , m_javaGeolocationServiceObject(0)
-{
-    ASSERT(m_listener);
-    startJavaImplementation(frame);
-}
-
-GeolocationServiceBridge::~GeolocationServiceBridge()
-{
-    stop();
-    stopJavaImplementation();
-}
-
-bool GeolocationServiceBridge::start()
-{
-    if (!m_javaGeolocationServiceObject)
-        return false;
-    return getJNIEnv()->CallBooleanMethod(m_javaGeolocationServiceObject,
-                                          javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodStart]);
-}
-
-void GeolocationServiceBridge::stop()
-{
-    if (!m_javaGeolocationServiceObject)
-        return;
-    getJNIEnv()->CallVoidMethod(m_javaGeolocationServiceObject,
-                                javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodStop]);
-}
-
-void GeolocationServiceBridge::setEnableGps(bool enable)
-{
-    if (!m_javaGeolocationServiceObject)
-        return;
-    getJNIEnv()->CallVoidMethod(m_javaGeolocationServiceObject,
-                                javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodSetEnableGps],
-                                enable);
-}
-
-void GeolocationServiceBridge::newLocationAvailable(JNIEnv* env, jclass, jlong nativeObject, jobject location)
-{
-    ASSERT(nativeObject);
-    ASSERT(location);
-    GeolocationServiceBridge* object = reinterpret_cast<GeolocationServiceBridge*>(nativeObject);
-    object->m_listener->newPositionAvailable(toGeoposition(env, location));
-}
-
-void GeolocationServiceBridge::newErrorAvailable(JNIEnv* env, jclass, jlong nativeObject, jstring message)
-{
-    GeolocationServiceBridge* object = reinterpret_cast<GeolocationServiceBridge*>(nativeObject);
-    RefPtr<PositionError> error =
-        PositionError::create(PositionError::POSITION_UNAVAILABLE, android::jstringToWtfString(env, message));
-    object->m_listener->newErrorAvailable(error.release());
-}
-
-PassRefPtr<Geoposition> GeolocationServiceBridge::toGeoposition(JNIEnv *env, const jobject &location)
-{
-    // Altitude is optional and may not be supplied.
-    bool hasAltitude =
-        env->CallBooleanMethod(location, javaLocationClassMethodIDs[LocationMethodHasAltitude]);
-    double Altitude =
-        hasAltitude ?
-        env->CallDoubleMethod(location, javaLocationClassMethodIDs[LocationMethodGetAltitude]) :
-        0.0;
-    // Accuracy is required, but is not supplied by the emulator.
-    double Accuracy =
-        env->CallBooleanMethod(location, javaLocationClassMethodIDs[LocationMethodHasAccuracy]) ?
-        env->CallFloatMethod(location, javaLocationClassMethodIDs[LocationMethodGetAccuracy]) :
-        0.0;
-    // heading is optional and may not be supplied.
-    bool hasHeading =
-        env->CallBooleanMethod(location, javaLocationClassMethodIDs[LocationMethodHasBearing]);
-    double heading =
-        hasHeading ?
-        env->CallFloatMethod(location, javaLocationClassMethodIDs[LocationMethodGetBearing]) :
-        0.0;
-    // speed is optional and may not be supplied.
-    bool hasSpeed =
-        env->CallBooleanMethod(location, javaLocationClassMethodIDs[LocationMethodHasSpeed]);
-    double speed =
-        hasSpeed ?
-        env->CallFloatMethod(location, javaLocationClassMethodIDs[LocationMethodGetSpeed]) :
-        0.0;
-
-    RefPtr<Coordinates> newCoordinates = WebCore::Coordinates::create(
-        env->CallDoubleMethod(location, javaLocationClassMethodIDs[LocationMethodGetLatitude]),
-        env->CallDoubleMethod(location, javaLocationClassMethodIDs[LocationMethodGetLongitude]),
-        hasAltitude, Altitude,
-        Accuracy,
-        false, 0.0,  // AltitudeAccuracy not provided.
-        hasHeading, heading,
-        hasSpeed, speed);
-
-    return WebCore::Geoposition::create(
-         newCoordinates.release(),
-         env->CallLongMethod(location, javaLocationClassMethodIDs[LocationMethodGetTime]));
-}
-
-void GeolocationServiceBridge::startJavaImplementation(Frame* frame)
-{
-    JNIEnv* env = getJNIEnv();
-
-    // Get the Java GeolocationService class.
-    jclass javaGeolocationServiceClass = env->FindClass(javaGeolocationServiceClassName);
-    ASSERT(javaGeolocationServiceClass);
-
-    // Set up the methods we wish to call on the Java GeolocationService class.
-    javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodInit] =
-            env->GetMethodID(javaGeolocationServiceClass, "<init>", "(Landroid/content/Context;J)V");
-    javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodStart] =
-            env->GetMethodID(javaGeolocationServiceClass, "start", "()Z");
-    javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodStop] =
-            env->GetMethodID(javaGeolocationServiceClass, "stop", "()V");
-    javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodSetEnableGps] =
-            env->GetMethodID(javaGeolocationServiceClass, "setEnableGps", "(Z)V");
-
-    // Create the Java GeolocationService object.
-    jobject context = android::WebViewCore::getWebViewCore(frame->view())->getContext();
-    if (!context)
-        return;
-    jlong nativeObject = reinterpret_cast<jlong>(this);
-    jobject object = env->NewObject(javaGeolocationServiceClass,
-                                    javaGeolocationServiceClassMethodIDs[GeolocationServiceMethodInit],
-                                    context,
-                                    nativeObject);
-
-    m_javaGeolocationServiceObject = getJNIEnv()->NewGlobalRef(object);
-    ASSERT(m_javaGeolocationServiceObject);
-
-    // Register to handle calls to native methods of the Java GeolocationService
-    // object. We register once only.
-    static int registered = jniRegisterNativeMethods(env,
-                                                     javaGeolocationServiceClassName,
-                                                     javaGeolocationServiceClassNativeMethods,
-                                                     NELEM(javaGeolocationServiceClassNativeMethods));
-    ASSERT(registered == JNI_OK);
-
-    // Set up the methods we wish to call on the Java Location class.
-    jclass javaLocationClass = env->FindClass(javaLocationClassName);
-    ASSERT(javaLocationClass);
-    javaLocationClassMethodIDs[LocationMethodGetLatitude] =
-        env->GetMethodID(javaLocationClass, "getLatitude", "()D");
-    javaLocationClassMethodIDs[LocationMethodGetLongitude] =
-        env->GetMethodID(javaLocationClass, "getLongitude", "()D");
-    javaLocationClassMethodIDs[LocationMethodHasAltitude] =
-        env->GetMethodID(javaLocationClass, "hasAltitude", "()Z");
-    javaLocationClassMethodIDs[LocationMethodGetAltitude] =
-        env->GetMethodID(javaLocationClass, "getAltitude", "()D");
-    javaLocationClassMethodIDs[LocationMethodHasAccuracy] =
-        env->GetMethodID(javaLocationClass, "hasAccuracy", "()Z");
-    javaLocationClassMethodIDs[LocationMethodGetAccuracy] =
-        env->GetMethodID(javaLocationClass, "getAccuracy", "()F");
-    javaLocationClassMethodIDs[LocationMethodHasBearing] =
-        env->GetMethodID(javaLocationClass, "hasBearing", "()Z");
-    javaLocationClassMethodIDs[LocationMethodGetBearing] =
-        env->GetMethodID(javaLocationClass, "getBearing", "()F");
-    javaLocationClassMethodIDs[LocationMethodHasSpeed] =
-        env->GetMethodID(javaLocationClass, "hasSpeed", "()Z");
-    javaLocationClassMethodIDs[LocationMethodGetSpeed] =
-        env->GetMethodID(javaLocationClass, "getSpeed", "()F");
-    javaLocationClassMethodIDs[LocationMethodGetTime] =
-        env->GetMethodID(javaLocationClass, "getTime", "()J");
-}
-
-void GeolocationServiceBridge::stopJavaImplementation()
-{
-    // Called by GeolocationServiceAndroid on WebKit thread.
-    if (!m_javaGeolocationServiceObject)
-        return;
-    getJNIEnv()->DeleteGlobalRef(m_javaGeolocationServiceObject);
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/platform/android/GeolocationServiceBridge.h b/Source/WebCore/platform/android/GeolocationServiceBridge.h
deleted file mode 100644
index 3997d65..0000000
--- a/Source/WebCore/platform/android/GeolocationServiceBridge.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 THE COPYRIGHT OWNER 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.
- */
-
-#ifndef GeolocationServiceBridge_h
-#define GeolocationServiceBridge_h
-
-#include "JNIUtility.h"
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-class Frame;
-class GeolocationServiceAndroid;
-class Geoposition;
-
-// GeolocationServiceBridge is the bridge to the Java implementation. It manages
-// the lifetime of the Java object. It is an implementation detail of
-// GeolocationServiceAndroid.
-class GeolocationServiceBridge {
-public:
-    typedef GeolocationServiceAndroid ListenerInterface;
-    GeolocationServiceBridge(ListenerInterface* listener, Frame* frame);
-    ~GeolocationServiceBridge();
-
-    bool start();
-    void stop();
-    void setEnableGps(bool enable);
-
-    // Static wrapper functions to hide JNI nastiness.
-    static void newLocationAvailable(JNIEnv *env, jclass, jlong nativeObject, jobject location);
-    static void newErrorAvailable(JNIEnv *env, jclass, jlong nativeObject, jstring message);
-    static PassRefPtr<Geoposition> toGeoposition(JNIEnv *env, const jobject &location);
-
-private:
-    void startJavaImplementation(Frame* frame);
-    void stopJavaImplementation();
-
-    ListenerInterface* m_listener;
-    jobject m_javaGeolocationServiceObject;
-};
-
-} // namespace WebCore
-
-#endif // GeolocationServiceBridge_h