Changeset 63742 in webkit

Timestamp:

Jul 20, 2010 7:24:47 AM (14 years ago)

Author:

abecsi@webkit.org

Message:

Need to be able to configure Geolocation policy regarding user permissions
​https://bugs.webkit.org/show_bug.cgi?id=42068

Patch by Mahesh Kulkarni <​mahesh.kulkarni@nokia.com> on 2010-07-20
Reviewed by Steve Block.

JavaScriptCore:

If CLIENT_BASED_GEOLOCATION is enabled, enable preemtive permission policy
by default

• wtf/Platform.h:

WebCore:

Introducing new USE() flag PREEMPT_GEOLOCATION_PREMISSION using which
acquires user permission first before starting location service

This change does not introduce any change in behavior for any platform. So there are no new tests
added.

• WebCore.pro:
• page/Geolocation.cpp:

(WebCore::Geolocation::startRequest):
(WebCore::Geolocation::setIsAllowed):
(WebCore::Geolocation::startUpdating):

• page/Geolocation.h:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (1 diff)
• WebCore/page/Geolocation.cpp (modified) (7 diffs)
• WebCore/page/Geolocation.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-07-20  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
+
+        Reviewed by Steve Block.
+
+        Need to be able to configure Geolocation policy regarding user permissions
+        https://bugs.webkit.org/show_bug.cgi?id=42068
+
+        If CLIENT_BASED_GEOLOCATION is enabled, enable preemtive permission policy
+        by default 
+
+        * wtf/Platform.h:
+        
 2010-07-19  Dirk Schulze  <krit@webkit.org>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -1117 +1117 @@
 #endif
 
+/* Geolocation request policy. pre-emptive policy is to acquire user permission before acquiring location.
+   Client based implementations will have option to choose between pre-emptive and nonpre-emptive permission policy.
+   pre-emptive permission policy is enabled by default for all client-based implementations. */
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+#define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION
+#endif
+
 #endif /* WTF_Platform_h */

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-20  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
+
+        Reviewed by Steve Block.
+
+        Need to be able to configure Geolocation policy regarding user permissions
+        https://bugs.webkit.org/show_bug.cgi?id=42068
+
+        Introducing new USE() flag PREEMPT_GEOLOCATION_PREMISSION using which
+        acquires user permission first before starting location service
+
+        This change does not introduce any change in behavior for any platform. So there are no new tests
+        added.
+
+        * WebCore.pro:
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::startRequest):
+        (WebCore::Geolocation::setIsAllowed):
+        (WebCore::Geolocation::startUpdating):
+        * page/Geolocation.h:
+
 2010-07-20  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/WebCore.pro

@@ -2708 +2708 @@
 
 contains(DEFINES, ENABLE_GEOLOCATION=1) {
+    # if geolocation is enabled, enable pre-request for permission policy
+    DEFINES += WTF_USE_PREEMPT_GEOLOCATION_PERMISSION
+
     HEADERS += \
         platform/qt/GeolocationServiceQt.h

trunk/WebCore/page/Geolocation.cpp

@@ -280 +280 @@
         notifier->setUseCachedPosition();
     else if (notifier->hasZeroTimeout() || startUpdating(notifier.get())) {
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
+#if USE(PREEMPT_GEOLOCATION_PERMISSION)
         // Only start timer if we're not waiting for user permission.
         if (!m_startRequestPermissionNotifier)
@@ -401 +401 @@
     m_allowGeolocation = allowed ? Yes : No;
     
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
+#if USE(PREEMPT_GEOLOCATION_PERMISSION)
     if (m_startRequestPermissionNotifier) {
         if (isAllowed()) {
@@ -407 +407 @@
             m_startRequestPermissionNotifier->startTimerIfNeeded();
             m_startRequestPermissionNotifier = 0;
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
             if (!m_frame)
                 return;
@@ -413 +414 @@
                 return;
             page->geolocationController()->addObserver(this);
+#else
+            // TODO: Handle startUpdate() for non-client based implementations using pre-emptive policy
+#endif
         } else {
             m_startRequestPermissionNotifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
@@ -613 +617 @@
 bool Geolocation::startUpdating(GeoNotifier* notifier)
 {
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
-    // FIXME: Pass options to client.
-
+#if USE(PREEMPT_GEOLOCATION_PERMISSION)
     if (!isAllowed()) {
         m_startRequestPermissionNotifier = notifier;
@@ -621 +623 @@
         return true;
     }
-    
+#endif
+
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
     if (!m_frame)
         return false;
@@ -629 +633 @@
         return false;
 
+    // FIXME: Pass options to client.
     page->geolocationController()->addObserver(this);
     return true;

trunk/WebCore/page/Geolocation.h

@@ -166 +166 @@
 #if !ENABLE(CLIENT_BASED_GEOLOCATION)
     OwnPtr<GeolocationService> m_service;
-#else
+#endif
+#if USE(PREEMPT_GEOLOCATION_PERMISSION)
     RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
 #endif