From db42c078ffb0f6a679e3853cb4ebb39e09c1f815 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 1 Feb 2010 12:40:44 +0000 Subject: [PATCH] Cherry-pick WebKit change 54080 for client-based Geolocation See http://trac.webkit.org/changeset/54080 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Id67cac441eeaa58268c0bfdc8306a047bc56fba9 --- WebCore/ChangeLog | 7 +++++++ WebCore/page/Geolocation.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index d2c246af1..c6906abfb 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,5 +1,12 @@ 2010-01-29 Steve Falkenburg + Build fix. + + * page/Geolocation.cpp: + (WebCore::Geolocation::startUpdating): + +2010-01-29 Steve Falkenburg + Reviewed by Darin Adler. Client-based Geolocation starts updating before getting consent from the user diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 1ab4a8c69..89897e17d 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -635,7 +635,7 @@ bool Geolocation::startUpdating(GeoNotifier* notifier) page->geolocationController()->addObserver(this); return true; #else - return m_service->startUpdating(notifier->options); + return m_service->startUpdating(notifier->m_options.get()); #endif } -- 2.11.0