Title: [134263] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 134263
- Author
- [email protected]
- Date
- 2012-11-12 11:18:26 -0800 (Mon, 12 Nov 2012)
Log Message
Merged r126903. <rdar://problem/12516356>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (134262 => 134263)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-12 19:13:08 UTC (rev 134262)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-12 19:18:26 UTC (rev 134263)
@@ -1,3 +1,28 @@
+2012-11-12 Lucas Forschler <[email protected]>
+
+ Merge r126903
+
+ 2012-08-28 Jon Lee <[email protected]>
+
+ [WK2] Bugs in maintenance of internal state when user decides whether to grant notification permissions
+ https://bugs.webkit.org/show_bug.cgi?id=95220
+ <rdar://problem/12189895>
+
+ Reviewed by Jessie Berlin.
+
+ A couple of the maps maintained by the request manager should have been cleaned up when the user decided on
+ whether to grant a website permission to post notifications.
+
+ Also, the web process' copy of the permissions was not updated appropriately. This meant that in the
+ permission callback, Notification.permission was not the same value as the permission value included as
+ the first parameter of the callback.
+
+ This first surfaced as part of the work to bring Mac support for web notifications. I have a test that
+ will check for regressions in this area, once all of that has been checked in (bug 77969).
+
+ * WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
+ (WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision):
+
2012-11-09 Lucas Forschler <[email protected]>
Merge r126490
@@ -47815,3 +47840,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp (134262 => 134263)
--- branches/safari-536.28-branch/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2012-11-12 19:13:08 UTC (rev 134262)
+++ branches/safari-536.28-branch/Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp 2012-11-12 19:18:26 UTC (rev 134263)
@@ -131,6 +131,11 @@
if (!isRequestIDValid(requestID))
return;
+ RefPtr<WebCore::SecurityOrigin> origin = m_idToOriginMap.take(requestID);
+ m_originToIDMap.remove(origin);
+
+ WebProcess::shared().notificationManager().didUpdateNotificationDecision(origin->toString(), allowed);
+
#if ENABLE(LEGACY_NOTIFICATIONS)
RefPtr<VoidCallback> voidCallback = m_idToVoidCallbackMap.take(requestID);
if (voidCallback) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
