2010-07-20 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r63742.
        http://trac.webkit.org/changeset/63742
        https://bugs.webkit.org/show_bug.cgi?id=42641

        Broke Leopard Intel build. (Requested by bbandix on #webkit).

        * wtf/Platform.h:
2010-07-20  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r63742.
        http://trac.webkit.org/changeset/63742
        https://bugs.webkit.org/show_bug.cgi?id=42641

        Broke Leopard Intel build. (Requested by bbandix on #webkit).

        * WebCore.pro:
        * page/Geolocation.cpp:
        (WebCore::Geolocation::startRequest):
        (WebCore::Geolocation::setIsAllowed):
        (WebCore::Geolocation::startUpdating):
        * page/Geolocation.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 19a10d6..185ad77 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r63742.
+        http://trac.webkit.org/changeset/63742
+        https://bugs.webkit.org/show_bug.cgi?id=42641
+
+        Broke Leopard Intel build. (Requested by bbandix on #webkit).
+
+        * wtf/Platform.h:
+
 2010-07-20  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
 
         Reviewed by Steve Block.

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 0204dcb..c62a274 100644 (file)
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1116,11 +1116,4 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define WTF_USE_PLATFORM_STRATEGIES 1
 #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 */

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4926773..671235a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r63742.
+        http://trac.webkit.org/changeset/63742
+        https://bugs.webkit.org/show_bug.cgi?id=42641
+
+        Broke Leopard Intel build. (Requested by bbandix on #webkit).
+
+        * WebCore.pro:
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::startRequest):
+        (WebCore::Geolocation::setIsAllowed):
+        (WebCore::Geolocation::startUpdating):
+        * page/Geolocation.h:
+
 2010-07-20  Adam Roben  <aroben@apple.com>
 
         Windows build fix

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 18042ea..f342dba 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2707,9 +2707,6 @@ contains(DEFINES, ENABLE_QT_BEARER=1) {
 }
 
 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
     SOURCES += \

diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 8532901..10e5d3b 100644 (file)
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -279,7 +279,7 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi
     else if (haveSuitableCachedPosition(notifier->m_options.get()))
         notifier->setUseCachedPosition();
     else if (notifier->hasZeroTimeout() || startUpdating(notifier.get())) {
-#if USE(PREEMPT_GEOLOCATION_PERMISSION)
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
         // Only start timer if we're not waiting for user permission.
         if (!m_startRequestPermissionNotifier)
 #endif            
@@ -400,22 +400,18 @@ void Geolocation::setIsAllowed(bool allowed)
     // position.
     m_allowGeolocation = allowed ? Yes : No;
     
-#if USE(PREEMPT_GEOLOCATION_PERMISSION)
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
     if (m_startRequestPermissionNotifier) {
         if (isAllowed()) {
             // Permission request was made during the startUpdating process
             m_startRequestPermissionNotifier->startTimerIfNeeded();
             m_startRequestPermissionNotifier = 0;
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
             if (!m_frame)
                 return;
             Page* page = m_frame->page();
             if (!page)
                 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));
             m_oneShots.add(m_startRequestPermissionNotifier);
@@ -616,15 +612,15 @@ void Geolocation::geolocationServiceErrorOccurred(GeolocationService* service)
 
 bool Geolocation::startUpdating(GeoNotifier* notifier)
 {
-#if USE(PREEMPT_GEOLOCATION_PERMISSION)
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+    // FIXME: Pass options to client.
+
     if (!isAllowed()) {
         m_startRequestPermissionNotifier = notifier;
         requestPermission();
         return true;
     }
-#endif
-
-#if ENABLE(CLIENT_BASED_GEOLOCATION)
+    
     if (!m_frame)
         return false;
 
@@ -632,7 +628,6 @@ bool Geolocation::startUpdating(GeoNotifier* notifier)
     if (!page)
         return false;
 
-    // FIXME: Pass options to client.
     page->geolocationController()->addObserver(this);
     return true;
 #else

diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 8c47d9c..4132bfe 100644 (file)
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -165,8 +165,7 @@ private:
     Frame* m_frame;
 #if !ENABLE(CLIENT_BASED_GEOLOCATION)
     OwnPtr<GeolocationService> m_service;
-#endif
-#if USE(PREEMPT_GEOLOCATION_PERMISSION)
+#else
     RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
 #endif
     RefPtr<Geoposition> m_lastPosition;