Changeset 58061 in webkit

Timestamp:

Apr 21, 2010 11:32:06 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Steve Block <​steveblock@google.com>

Reviewed by Kenneth Rohde Christiansen.

Replace Geolocation::suspend()/resume() which are required by Android.
​https://bugs.webkit.org/show_bug.cgi?id=37942

These methods were removed in Bug 36255.

Build fix only, no new tests.

• page/Geolocation.cpp: (WebCore::Geolocation::suspend): (WebCore::Geolocation::resume):
• page/Geolocation.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Geolocation.cpp (modified) (1 diff)
• page/Geolocation.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-21  Steve Block  <steveblock@google.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Replace Geolocation::suspend()/resume() which are required by Android.
+        https://bugs.webkit.org/show_bug.cgi?id=37942
+
+        These methods were removed in Bug 36255.
+
+        Build fix only, no new tests.
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::suspend):
+        (WebCore::Geolocation::resume):
+        * page/Geolocation.h:
+
 2010-04-21  Ray Rischpater  <Raymond.Rischpater@Nokia.com>
 

trunk/WebCore/page/Geolocation.cpp

@@ -380 +380 @@
 }
 
+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)
 {

trunk/WebCore/page/Geolocation.h

@@ -61 +61 @@
     int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
     void clearWatch(int watchId);
+
+    // These methods are used by Android.
+    void suspend();
+    void resume();
 
     void setIsAllowed(bool);