Changeset 51133 in webkit

Timestamp:

Nov 18, 2009 2:04:29 PM (14 years ago)

Author:

weinig@apple.com

Message:

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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Chrome.cpp (modified) (1 diff)
• page/Geolocation.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-18  Sam Weinig  <sam@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@apple.com>
 

trunk/WebCore/page/Chrome.cpp

@@ -408 +408 @@
 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);
 }

trunk/WebCore/page/Geolocation.cpp

@@ -89 +89 @@
 }
 
-void Geolocation::Watchers::set(int id, PassRefPtr<GeoNotifier> notifier)
-{
-    m_idToNotifierMap.set(id, notifier);
-    m_notifierToIdMap.set(notifier, id);
+void Geolocation::Watchers::set(int id, PassRefPtr<GeoNotifier> prpNotifier)
+{
+    RefPtr<GeoNotifier> notifier = prpNotifier;
+
+    m_idToNotifierMap.set(id, notifier.get());
+    m_notifierToIdMap.set(notifier.release(), id);
 }