Title: [132495] trunk/Source/WebKit2
- Revision
- 132495
- Author
- [email protected]
- Date
- 2012-10-25 09:34:48 -0700 (Thu, 25 Oct 2012)
Log Message
Assertion failure trying to dispatch notification messages
https://bugs.webkit.org/show_bug.cgi?id=100387
<rdar://problem/12573195>
Reviewed by Jessie Berlin.
Pass a zero destination ID when sending WebNotificationManagerProxy messages; they are not
used by the UI process and since the WebNotificationManagerProxy message receiver is global
passing a non-zero destination ID would cause the aforementioned assertion failure.
* WebProcess/Notifications/WebNotificationManager.cpp:
(WebKit::WebNotificationManager::cancel):
(WebKit::WebNotificationManager::clearNotifications):
(WebKit::WebNotificationManager::didDestroyNotification):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (132494 => 132495)
--- trunk/Source/WebKit2/ChangeLog 2012-10-25 16:30:35 UTC (rev 132494)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-25 16:34:48 UTC (rev 132495)
@@ -1,3 +1,20 @@
+2012-10-25 Anders Carlsson <[email protected]>
+
+ Assertion failure trying to dispatch notification messages
+ https://bugs.webkit.org/show_bug.cgi?id=100387
+ <rdar://problem/12573195>
+
+ Reviewed by Jessie Berlin.
+
+ Pass a zero destination ID when sending WebNotificationManagerProxy messages; they are not
+ used by the UI process and since the WebNotificationManagerProxy message receiver is global
+ passing a non-zero destination ID would cause the aforementioned assertion failure.
+
+ * WebProcess/Notifications/WebNotificationManager.cpp:
+ (WebKit::WebNotificationManager::cancel):
+ (WebKit::WebNotificationManager::clearNotifications):
+ (WebKit::WebNotificationManager::didDestroyNotification):
+
2012-10-25 Alexey Proskuryakov <[email protected]>
REGRESSION (r131686): Crashes in NSToolTipManager
Modified: trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp (132494 => 132495)
--- trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp 2012-10-25 16:30:35 UTC (rev 132494)
+++ trunk/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp 2012-10-25 16:34:48 UTC (rev 132495)
@@ -174,7 +174,7 @@
if (!notificationID)
return;
- m_process->connection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), page->pageID());
+ m_process->connection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), 0);
#else
UNUSED_PARAM(notification);
UNUSED_PARAM(page);
@@ -189,7 +189,7 @@
return;
Vector<uint64_t>& notificationIDs = it->value;
- m_process->connection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), page->pageID());
+ m_process->connection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), 0);
size_t count = notificationIDs.size();
for (size_t i = 0; i < count; ++i) {
RefPtr<Notification> notification = m_notificationIDMap.take(notificationIDs[i]);
@@ -215,7 +215,7 @@
m_notificationIDMap.remove(notificationID);
removeNotificationFromContextMap(notificationID, notification);
- m_process->connection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), page->pageID());
+ m_process->connection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), 0);
#else
UNUSED_PARAM(notification);
UNUSED_PARAM(page);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
