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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2c246a..c6906ab 100644 (file)
--- 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 (file)
--- 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
 }