[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit b004b05387b12b6746eb00c8d0f295688a600b8a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 20:53:08 2010 +0000

    2010-01-15  Steve Block  <steveblock at google.com>
    
            Reviewed by Eric Seidel.
    
            Make Geolocation::suspend/resume public.
            https://bugs.webkit.org/show_bug.cgi?id=33679
    
            These were made private in Bug 32499, but are required by Android to be public.
    
            No new tests, build fix only.
    
            * page/Geolocation.cpp: Modified
            (WebCore::Geolocation::suspend): Added back in
            (WebCore::Geolocation::resume): Added back in
            * page/Geolocation.h: Modified. Make suspend and resume public
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5fe6398..69fc8d4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-15  Steve Block  <steveblock at google.com>
+
+        Reviewed by Eric Seidel.
+
+        Make Geolocation::suspend/resume public.
+        https://bugs.webkit.org/show_bug.cgi?id=33679
+
+        These were made private in Bug 32499, but are required by Android to be public.
+
+        No new tests, build fix only.
+
+        * page/Geolocation.cpp: Modified
+        (WebCore::Geolocation::suspend): Added back in
+        (WebCore::Geolocation::resume): Added back in
+        * page/Geolocation.h: Modified. Make suspend and resume public
+
 2010-01-15  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 12c9f4e..1b4ce49 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -278,6 +278,22 @@ void Geolocation::clearWatch(int watchId)
         stopUpdating();
 }
 
+void Geolocation::suspend()
+{
+#if !ENABLE(CLIENT_BASED_GEOLOCATION)
+    if (hasListeners())
+        m_service->suspend();
+#endif
+}
+
+void Geolocation::resume()
+{
+#if !ENABLE(CLIENT_BASED_GEOLOCATION)
+    if (hasListeners())
+        m_service->resume();
+#endif
+}
+
 void Geolocation::setIsAllowed(bool allowed)
 {
     m_allowGeolocation = allowed ? Yes : No;
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index a7045cb..a5381d8 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -68,7 +68,10 @@ public:
     void getCurrentPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
     int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
     void clearWatch(int watchId);
-    
+
+    void suspend();
+    void resume();
+
     void setIsAllowed(bool);
     bool isAllowed() const { return m_allowGeolocation == Yes; }
     bool isDenied() const { return m_allowGeolocation == No; }
@@ -137,8 +140,6 @@ private:
 
     bool startUpdating(PositionOptions*);
     void stopUpdating();
-    void suspend();
-    void resume();
 
 #if !ENABLE(CLIENT_BASED_GEOLOCATION)
     // GeolocationServiceClient

-- 
WebKit Debian packaging