Attachment 46584 Details for Bug 33679 – Patch 2 for Bug 33679

[patch] Patch 2 for Bug 33679

geolocationSuspendResumePublic2.txt (text/plain), 2.29 KB, created by Steve Block on 2010-01-14 10:25:08 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Block

Created: 2010-01-14 10:25:08 PST

Size: 2.29 KB

patch

obsolete

>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 53269)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2010-01-14  Steve Block  <steveblock@google.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-14  Martin Robinson  <martin.james.robinson@gmail.com>
> 
>         Reviewed by Xan Lopez.
>Index: WebCore/page/Geolocation.cpp
>===================================================================
>--- WebCore/page/Geolocation.cpp	(revision 53269)
>+++ WebCore/page/Geolocation.cpp	(working copy)
>@@ -278,6 +278,18 @@ void Geolocation::clearWatch(int watchId
>         stopUpdating();
> }
> 
>+void Geolocation::suspend()
>+{
>+    if (hasListeners())
>+        m_service->suspend();
>+}
>+
>+void Geolocation::resume()
>+{
>+    if (hasListeners())
>+        m_service->resume();
>+}
>+
> void Geolocation::setIsAllowed(bool allowed)
> {
>     m_allowGeolocation = allowed ? Yes : No;
>Index: WebCore/page/Geolocation.h
>===================================================================
>--- WebCore/page/Geolocation.h	(revision 53269)
>+++ WebCore/page/Geolocation.h	(working copy)
>@@ -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

Actions: View | Formatted Diff | Diff

Attachments on bug 33679: 46582 | 46584 | 46585