[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
sfalken at apple.com
sfalken at apple.com
Thu Apr 8 01:31:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 00613d7e7fc2313c4d3ec31d7770e03c2fa6456b
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 29 22:16:36 2010 +0000
Build fix.
* page/Geolocation.cpp:
(WebCore::Geolocation::startUpdating):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54080 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9fdb61e..ae9fd9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-01-29 Steve Falkenburg <sfalken at apple.com>
+ Build fix.
+
+ * page/Geolocation.cpp:
+ (WebCore::Geolocation::startUpdating):
+
+2010-01-29 Steve Falkenburg <sfalken at 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 f6b52fd..d344744 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -520,7 +520,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
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list