Title: [93596] trunk/Source/WebCore
Revision
93596
Author
stevebl...@google.com
Date
2011-08-23 05:45:59 -0700 (Tue, 23 Aug 2011)

Log Message

Remove Android-specific modifications to non-client-based Geolocation
https://bugs.webkit.org/show_bug.cgi?id=66759

Reviewed by Tony Gentilcore.

No new tests, removing dead code only.

* page/Geolocation.cpp:
* page/Geolocation.h:
* platform/GeolocationService.h:
* platform/efl/GeolocationServiceEfl.cpp:
* platform/efl/GeolocationServiceEfl.h:
* platform/gtk/GeolocationServiceGtk.cpp:
* platform/gtk/GeolocationServiceGtk.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (93595 => 93596)


--- trunk/Source/WebCore/ChangeLog	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/ChangeLog	2011-08-23 12:45:59 UTC (rev 93596)
@@ -1,3 +1,20 @@
+2011-08-23  Steve Block  <stevebl...@google.com>
+
+        Remove Android-specific modifications to non-client-based Geolocation
+        https://bugs.webkit.org/show_bug.cgi?id=66759
+
+        Reviewed by Tony Gentilcore.
+
+        No new tests, removing dead code only.
+
+        * page/Geolocation.cpp:
+        * page/Geolocation.h:
+        * platform/GeolocationService.h:
+        * platform/efl/GeolocationServiceEfl.cpp:
+        * platform/efl/GeolocationServiceEfl.h:
+        * platform/gtk/GeolocationServiceGtk.cpp:
+        * platform/gtk/GeolocationServiceGtk.h:
+
 2011-08-19  Pavel Podivilov  <podivi...@chromium.org>
 
         Web Inspector: switch to using BreakpointManager.

Modified: trunk/Source/WebCore/page/Geolocation.cpp (93595 => 93596)


--- trunk/Source/WebCore/page/Geolocation.cpp	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/page/Geolocation.cpp	2011-08-23 12:45:59 UTC (rev 93596)
@@ -424,22 +424,6 @@
         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)
 {
     // Protect the Geolocation object from garbage collection during a callback.

Modified: trunk/Source/WebCore/page/Geolocation.h (93595 => 93596)


--- trunk/Source/WebCore/page/Geolocation.h	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/page/Geolocation.h	2011-08-23 12:45:59 UTC (rev 93596)
@@ -64,10 +64,6 @@
     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);
     Frame* frame() const { return m_frame; }
 

Modified: trunk/Source/WebCore/platform/GeolocationService.h (93595 => 93596)


--- trunk/Source/WebCore/platform/GeolocationService.h	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/platform/GeolocationService.h	2011-08-23 12:45:59 UTC (rev 93596)
@@ -52,9 +52,6 @@
     virtual bool startUpdating(PositionOptions*) { return false; }
     virtual void stopUpdating() { }
 
-    virtual void suspend() { }
-    virtual void resume() { }
-
     virtual Geoposition* lastPosition() const { return 0; }
     virtual PositionError* lastError() const { return 0; }
 

Modified: trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp (93595 => 93596)


--- trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.cpp	2011-08-23 12:45:59 UTC (rev 93596)
@@ -56,16 +56,6 @@
     notImplemented();
 }
 
-void GeolocationServiceEfl::suspend()
-{
-    notImplemented();
-}
-
-void GeolocationServiceEfl::resume()
-{
-    notImplemented();
-}
-
 Geoposition* GeolocationServiceEfl::lastPosition() const
 {
     return m_lastPosition.get();

Modified: trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.h (93595 => 93596)


--- trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.h	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/platform/efl/GeolocationServiceEfl.h	2011-08-23 12:45:59 UTC (rev 93596)
@@ -37,9 +37,6 @@
     virtual bool startUpdating(PositionOptions*);
     virtual void stopUpdating();
 
-    virtual void suspend();
-    virtual void resume();
-
     virtual Geoposition* lastPosition() const;
     virtual PositionError* lastError() const;
 

Modified: trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.cpp (93595 => 93596)


--- trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.cpp	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.cpp	2011-08-23 12:45:59 UTC (rev 93596)
@@ -137,18 +137,6 @@
     m_geoclueClient = 0;
 }
 
-void GeolocationServiceGtk::suspend()
-{
-    // not available with geoclue
-    notImplemented();
-}
-
-void GeolocationServiceGtk::resume()
-{
-    // not available with geoclue
-    notImplemented();
-}
-
 Geoposition* GeolocationServiceGtk::lastPosition() const
 {
     return m_lastPosition.get();

Modified: trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.h (93595 => 93596)


--- trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.h	2011-08-23 12:43:31 UTC (rev 93595)
+++ trunk/Source/WebCore/platform/gtk/GeolocationServiceGtk.h	2011-08-23 12:45:59 UTC (rev 93596)
@@ -38,9 +38,6 @@
         virtual bool startUpdating(PositionOptions*);
         virtual void stopUpdating();
 
-        virtual void suspend();
-        virtual void resume();
-
         Geoposition* lastPosition() const;
         PositionError* lastError() const;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to