WebCore/ChangeLog

2008-10-29  Greg Bolsinga  <bolsinga@apple.com>

        Reviewed by NOBODY (OOPS!).

        WARNING: NO TEST CASES ADDED OR CHANGED

        * page/Geolocation.cpp:

        (WebCore::Geolocation::clearWatch):

        (WebCore::Geolocation::suspend):

        (WebCore::Geolocation::resume):

        (WebCore::Geolocation::geolocationServicePositionChanged):

        * page/Geolocation.h:

        (WebCore::Geolocation::hasListeners):

        (WebCore::GeolocationService::suspend):

        (WebCore::GeolocationService::resume):

2008-10-29  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed and slightly changed by Holger Freyther.

37988

WebCore/page/Geolocation.cpp

@@void Geolocation::clearWatch(int watchId

{

    m_watchers.remove(watchId);

108 stopUpdatingIfEmpty();

108 if (!hasListeners())

109 m_service->stopUpdating();

109110}

110111

111 void Geolocation::sto~~pUpdatingIfEmpty~~()

112void Geolocation::suspend()

112113{

113 if (m_watchers.isEmpty() && m_oneShots.isEmpty())

114 m_service->stopUpdating();

    if (hasListeners())

        m_service->suspend();

}

void Geolocation::resume()

{

    if (hasListeners())

        m_service->resume();

}

void Geolocation::sendErrorToOneShots(PositionError* error)

@@void Geolocation::geolocationServicePosi

    sendPositionToWatchers(service->lastPosition());

    m_oneShots.clear();

203 stopUpdatingIfEmpty();

    if (!hasListeners())

        m_service->stopUpdating();

}

void Geolocation::geolocationServiceErrorOccurred(GeolocationService* service)

37988

WebCore/page/Geolocation.h

@@public:

    int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PositionOptions*);

    void clearWatch(int watchId);

    void suspend();

    void resume();

private:

    Geolocation(Frame*);

@@private:

        GeoNotifier(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PositionOptions*);

    };

78 void sto~~pUpd~~at~~ingIf~~Empty();

81 bool hasListeners() const { return !m_oneShots.isEmpty() || !m_watchers.isEmpty(); }

    void sendErrorToOneShots(PositionError*);

    void sendErrorToWatchers(PositionError*);

37988

WebCore/platform/GeolocationService.h

@@public:

    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; }

37988