Title: [191342] trunk/Source/WebKit2
- Revision
- 191342
- Author
- [email protected]
- Date
- 2015-10-20 09:02:48 -0700 (Tue, 20 Oct 2015)
Log Message
Unreviewed, rolling out r191333.
https://bugs.webkit.org/show_bug.cgi?id=150362
Caused assertions on regression tests (Requested by ap on
#webkit).
Reverted changeset:
"ERROR: Unhandled web process message
'StorageAreaMap:DispatchStorageEvent'"
https://bugs.webkit.org/show_bug.cgi?id=150315
http://trac.webkit.org/changeset/191333
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191341 => 191342)
--- trunk/Source/WebKit2/ChangeLog 2015-10-20 15:04:44 UTC (rev 191341)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-20 16:02:48 UTC (rev 191342)
@@ -1,3 +1,18 @@
+2015-10-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r191333.
+ https://bugs.webkit.org/show_bug.cgi?id=150362
+
+ Caused assertions on regression tests (Requested by ap on
+ #webkit).
+
+ Reverted changeset:
+
+ "ERROR: Unhandled web process message
+ 'StorageAreaMap:DispatchStorageEvent'"
+ https://bugs.webkit.org/show_bug.cgi?id=150315
+ http://trac.webkit.org/changeset/191333
+
2015-10-20 Carlos Garcia Campos <[email protected]>
[UNIX] ASSERTION FAILED: m_shouldWaitForSyncReplies in Connection::connectionDidClose()
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (191341 => 191342)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-10-20 15:04:44 UTC (rev 191341)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2015-10-20 16:02:48 UTC (rev 191342)
@@ -736,7 +736,6 @@
continue;
if (!origin->isSameSchemeHostPort(&area->securityOrigin()))
continue;
- area->addListener(connection, storageMapID);
m_storageAreasByConnection.remove(it);
m_storageAreasByConnection.add({ &connection, storageMapID }, WTF::move(area));
return;
@@ -797,12 +796,11 @@
return;
}
- it->value->removeListener(connection, storageMapID);
-
// Don't remove session storage maps. The web process may reconnect and expect the data to still be around.
if (it->value->isSessionStorage())
return;
+ it->value->removeListener(connection, storageMapID);
m_storageAreasByConnection.remove(connectionAndStorageMapIDPair);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes