[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
weinig at apple.com
weinig at apple.com
Thu Dec 3 13:39:22 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 031b60dedb274cbe5d17d48ef22eb19fefad80ee
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 18 22:04:29 2009 +0000
Fix two Geolocation assertions.
Reviewed by Anders Carlsson.
* page/Chrome.cpp:
(WebCore::Chrome::requestGeolocationPermissionForFrame): No need to use PageGroupLoadDeferrer since this
is not called from JS.
* page/Geolocation.cpp:
(WebCore::Geolocation::Watchers::set): The PassRefPtr was getting nulled out, so we need to put it in
a RefPtr first.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ac3966..b0649ef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-18 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Fix two Geolocation assertions.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::requestGeolocationPermissionForFrame): No need to use PageGroupLoadDeferrer since this
+ is not called from JS.
+ * page/Geolocation.cpp:
+ (WebCore::Geolocation::Watchers::set): The PassRefPtr was getting nulled out, so we need to put it in
+ a RefPtr first.
+
2009-11-18 Alexey Proskuryakov <ap at apple.com>
Case sensitive file system build fix.
diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index d7d1a57..d79b417 100644
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -407,11 +407,6 @@ void Chrome::print(Frame* frame)
void Chrome::requestGeolocationPermissionForFrame(Frame* frame, Geolocation* geolocation)
{
- // Defer loads in case the client method runs a new event loop that would
- // otherwise cause the load to continue while we're in the middle of executing JavaScript.
- PageGroupLoadDeferrer deferrer(m_page, true);
-
- ASSERT(frame);
m_client->requestGeolocationPermissionForFrame(frame, geolocation);
}
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 55a016f..d69b2de 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -88,10 +88,12 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
m_geolocation->requestTimedOut(this);
}
-void Geolocation::Watchers::set(int id, PassRefPtr<GeoNotifier> notifier)
+void Geolocation::Watchers::set(int id, PassRefPtr<GeoNotifier> prpNotifier)
{
- m_idToNotifierMap.set(id, notifier);
- m_notifierToIdMap.set(notifier, id);
+ RefPtr<GeoNotifier> notifier = prpNotifier;
+
+ m_idToNotifierMap.set(id, notifier.get());
+ m_notifierToIdMap.set(notifier.release(), id);
}
void Geolocation::Watchers::remove(int id)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list