[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b7bae28b20f05249172553c3c34586ccdca14046
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 16:09:12 2010 +0000

    2010-08-18  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r65603.
            http://trac.webkit.org/changeset/65603
            https://bugs.webkit.org/show_bug.cgi?id=44179
    
            4 tests crash on Qt bot (Requested by Ossy on #webkit).
    
            * WebCore.pro:
            * page/Geolocation.cpp:
            (WebCore::Geolocation::handlePendingPermissionNotifiers):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9c5577e..f9d9474 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-18  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r65603.
+        http://trac.webkit.org/changeset/65603
+        https://bugs.webkit.org/show_bug.cgi?id=44179
+
+        4 tests crash on Qt bot (Requested by Ossy on #webkit).
+
+        * WebCore.pro:
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::handlePendingPermissionNotifiers):
+
 2010-08-18  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Unreviewed.  Attempted build fix for EFL
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index d31b1f2..7118e4c 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2796,7 +2796,6 @@ contains(DEFINES, ENABLE_QT_BEARER=1) {
 }
 
 contains(DEFINES, ENABLE_GEOLOCATION=1) {
-    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 57ad963..fd10f27 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -678,6 +678,14 @@ void Geolocation::stopUpdating()
 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
 void Geolocation::handlePendingPermissionNotifiers()
 {
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+    if (!m_frame)
+        return;
+    Page* page = m_frame->page();
+    if (!page)
+        return;
+#endif
+
     // While we iterate through the list, we need not worry about list being modified as the permission 
     // is already set to Yes/No and no new listeners will be added to the pending list
     GeoNotifierSet::const_iterator end = m_pendingForPermissionNotifiers.end();
@@ -687,10 +695,12 @@ void Geolocation::handlePendingPermissionNotifiers()
         if (isAllowed()) {
             // start all pending notification requests as permission granted.
             // The notifier is always ref'ed by m_oneShots or m_watchers.
-            if (startUpdating(notifier))
-                notifier->startTimerIfNeeded();
-            else
-                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+            notifier->startTimerIfNeeded();
+            page->geolocationController()->addObserver(this, notifier->m_options->enableHighAccuracy());
+#else
+            // TODO: Handle startUpdate() for non-client based implementations using pre-emptive policy
+#endif
         } else
             notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
     }

-- 
WebKit Debian packaging