Changeset 133247 in webkit

Timestamp:

Nov 1, 2012 6:17:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add a prompt to enable global location services
​https://bugs.webkit.org/show_bug.cgi?id=100992

PR 227897

Patch by Otto Derek Cheung <​otcheung@rim.com> on 2012-11-01
Reviewed by Rob Buis.

Adding a dialog to let the user know location services isn't enabled.
Currently, the browser app does not check whether the global setting for
location service is enabled. This patch adds a dialog to allow the user
to open the settings app and change that setting. This infobar will only
show once per session. If the user fails to turn on location services after
the first prompt, all geolocation requests will automatically fail.

Also, adapting GeolocationClientBlackBerry to the removal of GeoTracker.
The class now talks directly to the geo handler singleton.

• Api/WebPageClient.h:
• WebCoreSupport/GeolocationClientBlackBerry.cpp:

(GeolocationClientBlackBerry::GeolocationClientBlackBerry):
(GeolocationClientBlackBerry::geolocationDestroyed):
(GeolocationClientBlackBerry::startUpdating):
(GeolocationClientBlackBerry::stopUpdating):
(GeolocationClientBlackBerry::requestPermission):
(GeolocationClientBlackBerry::setEnableHighAccuracy):

• WebCoreSupport/GeolocationClientBlackBerry.h:

(WebCore::GeolocationClientBlackBerry::requiresHighAccuracy):
(GeolocationClientBlackBerry):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/GeolocationClientBlackBerry.cpp (modified) (6 diffs)
• WebCoreSupport/GeolocationClientBlackBerry.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -161 +161 @@
     virtual void cursorChanged(Platform::CursorType, const char* url, int x, int y) = 0;
 
+    virtual void requestGlobalLocalServicePermission(Platform::GeoTrackerListener*, const BlackBerry::Platform::String& origin) = 0;
+
     virtual void requestGeolocationPermission(Platform::GeoTrackerListener*, const BlackBerry::Platform::String& origin) = 0;
     virtual void cancelGeolocationPermission() = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-11-01  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] Add a prompt to enable global location services
+        https://bugs.webkit.org/show_bug.cgi?id=100992
+        
+        PR 227897
+
+        Reviewed by Rob Buis.
+
+        Adding a dialog to let the user know location services isn't enabled.
+        Currently, the browser app does not check whether the global setting for
+        location service is enabled. This patch adds a dialog to allow the user
+        to open the settings app and change that setting. This infobar will only
+        show once per session. If the user fails to turn on location services after
+        the first prompt, all geolocation requests will automatically fail.
+
+        Also, adapting GeolocationClientBlackBerry to the removal of GeoTracker.
+        The class now talks directly to the geo handler singleton.
+
+        * Api/WebPageClient.h:
+        * WebCoreSupport/GeolocationClientBlackBerry.cpp:
+        (GeolocationClientBlackBerry::GeolocationClientBlackBerry):
+        (GeolocationClientBlackBerry::geolocationDestroyed):
+        (GeolocationClientBlackBerry::startUpdating):
+        (GeolocationClientBlackBerry::stopUpdating):
+        (GeolocationClientBlackBerry::requestPermission):
+        (GeolocationClientBlackBerry::setEnableHighAccuracy):
+        * WebCoreSupport/GeolocationClientBlackBerry.h:
+        (WebCore::GeolocationClientBlackBerry::requiresHighAccuracy):
+        (GeolocationClientBlackBerry):
+
 2012-11-01  Michael Matovsky  <mmatovsky@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp

@@ -40 +40 @@
 GeolocationClientBlackBerry::GeolocationClientBlackBerry(BlackBerry::WebKit::WebPagePrivate* webPagePrivate)
     : m_webPagePrivate(webPagePrivate)
-    , m_tracker(0)
     , m_accuracy(false)
+    , m_isActive(false)
 {
 }
@@ -47 +47 @@
 void GeolocationClientBlackBerry::geolocationDestroyed()
 {
-    if (m_tracker)
-        m_tracker->destroy();
     delete this;
 }
@@ -54 +52 @@
 void GeolocationClientBlackBerry::startUpdating()
 {
-    if (m_tracker)
-        m_tracker->resume();
-    else
-        m_tracker = BlackBerry::Platform::GeoTracker::create(this, m_accuracy);
+    if (!m_isActive)
+        BlackBerry::Platform::GeolocationHandler::instance()->addListener(this, false);
+    m_isActive = true;
 }
 
 void GeolocationClientBlackBerry::stopUpdating()
 {
-    if (m_tracker)
-        m_tracker->suspend();
+    if (m_isActive)
+        BlackBerry::Platform::GeolocationHandler::instance()->removeListener(this);
+    m_isActive = false;
 }
 
@@ -76 +74 @@
     if (!frame)
         return;
+
+    // FIXME: The geolocation setting for WebSettings is always true. Nothing ever toggles that setting.
     if (!m_webPagePrivate->m_webSettings->isGeolocationEnabled()) {
         location->setIsAllowed(false);
         return;
     }
+
     DOMWindow* window = frame->document()->domWindow();
     if (!window)
@@ -86 +87 @@
     const BlackBerry::Platform::String origin = frameOrigin(frame);
     m_pendingPermissionGeolocation = location;
+
+    // Check global location setting, if it is off then we request an infobar that invokes a location settings card.
+    // If it's on, then we request an infobar that allows the site to have permission to use geolocation.
+    if (!BlackBerry::Platform::GeolocationHandler::instance()->isGlobalServiceActive()) {
+        // We only want to ask them once per session. If we get here again, automatically fail the request.
+        if (!BlackBerry::Platform::GeolocationHandler::instance()->didAskUserForGlobalPermission()) {
+            m_webPagePrivate->m_client->requestGlobalLocalServicePermission(this, origin);
+            BlackBerry::Platform::GeolocationHandler::instance()->setAskedUserForGlobalPermission();
+        } else
+            onPermission(false);
+        return;
+    }
+
     m_webPagePrivate->m_client->requestGeolocationPermission(this, origin);
 }
@@ -116 +130 @@
 void GeolocationClientBlackBerry::setEnableHighAccuracy(bool newAccuracy)
 {
-    if (m_accuracy == newAccuracy)
-        return;
-
+    // FIXME: we have to implement high accuracy on our side too
     m_accuracy = newAccuracy;
-
-    if (m_tracker)
-        m_tracker->setRequiresHighAccuracy(m_accuracy);
 }
 

trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.h

@@ -45 +45 @@
     virtual void cancelPermissionRequest(Geolocation*);
 
+    virtual bool requiresHighAccuracy() { return m_accuracy; }
     virtual void onLocationUpdate(double timestamp, double latitude, double longitude, double accuracy, double altitude, bool altitudeValid, double altitudeAccuracy,
                                   bool altitudeAccuracyValid, double speed, bool speedValid, double heading, bool headingValid);
     virtual void onLocationError(const char* error);
     virtual void onPermission(bool isAllowed);
-    BlackBerry::Platform::GeoTracker* tracker() const { return m_tracker; }
 
 private:
     BlackBerry::WebKit::WebPagePrivate* m_webPagePrivate;
-    BlackBerry::Platform::GeoTracker* m_tracker;
     RefPtr<Geolocation> m_pendingPermissionGeolocation;
     RefPtr<GeolocationPosition> m_lastPosition;
     bool m_accuracy;
+    bool m_isActive;
 };
 }