diff options
| author | Steve Block <steveblock@google.com> | 2010-02-01 12:40:44 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-01 13:20:06 +0000 |
| commit | db42c078ffb0f6a679e3853cb4ebb39e09c1f815 (patch) | |
| tree | ef8012000bb8cb14ae840072ec8eff712a294ca4 | |
| parent | 23c22a60ec108914d8df8cd80023582fbedfe978 (diff) | |
| download | external_webkit-db42c078ffb0f6a679e3853cb4ebb39e09c1f815.zip external_webkit-db42c078ffb0f6a679e3853cb4ebb39e09c1f815.tar.gz external_webkit-db42c078ffb0f6a679e3853cb4ebb39e09c1f815.tar.bz2 | |
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
| -rw-r--r-- | WebCore/ChangeLog | 7 | ||||
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index d2c246a..c6906ab 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,5 +1,12 @@ 2010-01-29 Steve Falkenburg <sfalken@apple.com> + Build fix. + + * page/Geolocation.cpp: + (WebCore::Geolocation::startUpdating): + +2010-01-29 Steve Falkenburg <sfalken@apple.com> + 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 1ab4a8c..89897e1 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 } |