From e69f6aab4f5d93208365709a92a030adadecabf1 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 22 Jan 2010 15:13:04 +0000 Subject: Cherry-pick WebKit change 52104 to make changes to Geolocation See http://trac.webkit.org/changeset/52104 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I342b9f6b6ef5a25fac37dd2187a67a834fb7e270 --- WebCore/page/Geolocation.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'WebCore/page/Geolocation.cpp') diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index f0578a8..5a9768c 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -44,7 +44,6 @@ #include "GeolocationController.h" #include "GeolocationError.h" #include "GeolocationPosition.h" -#include "Geoposition.h" #include "PositionError.h" #endif -- cgit v1.1 From daee1033b2624ef1e03be35756ea75afaa7ea501 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 22 Jan 2010 14:44:13 +0000 Subject: Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public See http://trac.webkit.org/changeset/53342 Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3 --- WebCore/page/Geolocation.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'WebCore/page/Geolocation.cpp') diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 5a9768c..231d57a 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -495,14 +495,18 @@ void Geolocation::clearWatch(int watchId) 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) -- cgit v1.1 From 1c58588a98d412c23d74caf92991904fddbc9d49 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 22 Jan 2010 14:51:37 +0000 Subject: Cherry-pick WebKit change 53441 to make changes to Geolocation See http://trac.webkit.org/changeset/53441 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Ib69ddd4d1b0944c861ac6c35412936ec1209cff0 --- WebCore/page/Geolocation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'WebCore/page/Geolocation.cpp') diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 231d57a..cc5cc93 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -121,15 +121,15 @@ void Geolocation::GeoNotifier::timerFired(Timer*) { m_timer.stop(); - // Cache our pointer to the Geolocation object, as this GeoNotifier object + // Protect this GeoNotifier object, since it // could be deleted by a call to clearWatch in a callback. - Geolocation* geolocation = m_geolocation; + RefPtr protect(this); if (m_fatalError) { if (m_errorCallback) m_errorCallback->handleEvent(m_fatalError.get()); // This will cause this notifier to be deleted. - geolocation->fatalErrorOccurred(this); + m_geolocation->fatalErrorOccurred(this); return; } @@ -138,7 +138,7 @@ void Geolocation::GeoNotifier::timerFired(Timer*) // Clear the cached position in case this is a watch request, which // will continue to run. m_cachedPosition = 0; - geolocation->requestReturnedCachedPosition(this); + m_geolocation->requestReturnedCachedPosition(this); return; } @@ -146,7 +146,7 @@ void Geolocation::GeoNotifier::timerFired(Timer*) RefPtr error = PositionError::create(PositionError::TIMEOUT, "Timeout expired"); m_errorCallback->handleEvent(error.get()); } - geolocation->requestTimedOut(this); + m_geolocation->requestTimedOut(this); } void Geolocation::Watchers::set(int id, PassRefPtr prpNotifier) -- cgit v1.1