Changeset 53342 in webkit


Ignore:
Timestamp:
Jan 15, 2010 12:53:08 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-15 Steve Block <steveblock@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
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r53338 r53342  
     12010-01-15  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Make Geolocation::suspend/resume public.
     6        https://bugs.webkit.org/show_bug.cgi?id=33679
     7
     8        These were made private in Bug 32499, but are required by Android to be public.
     9
     10        No new tests, build fix only.
     11
     12        * page/Geolocation.cpp: Modified
     13        (WebCore::Geolocation::suspend): Added back in
     14        (WebCore::Geolocation::resume): Added back in
     15        * page/Geolocation.h: Modified. Make suspend and resume public
     16
    1172010-01-15  Alexander Pavlov  <apavlov@chromium.org>
    218
  • trunk/WebCore/page/Geolocation.cpp

    r52104 r53342  
    279279}
    280280
     281void Geolocation::suspend()
     282{
     283#if !ENABLE(CLIENT_BASED_GEOLOCATION)
     284    if (hasListeners())
     285        m_service->suspend();
     286#endif
     287}
     288
     289void Geolocation::resume()
     290{
     291#if !ENABLE(CLIENT_BASED_GEOLOCATION)
     292    if (hasListeners())
     293        m_service->resume();
     294#endif
     295}
     296
    281297void Geolocation::setIsAllowed(bool allowed)
    282298{
  • trunk/WebCore/page/Geolocation.h

    r52345 r53342  
    6969    int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
    7070    void clearWatch(int watchId);
    71    
     71
     72    void suspend();
     73    void resume();
     74
    7275    void setIsAllowed(bool);
    7376    bool isAllowed() const { return m_allowGeolocation == Yes; }
     
    138141    bool startUpdating(PositionOptions*);
    139142    void stopUpdating();
    140     void suspend();
    141     void resume();
    142143
    143144#if !ENABLE(CLIENT_BASED_GEOLOCATION)
Note: See TracChangeset for help on using the changeset viewer.