Title: [214149] branches/safari-603-branch/Source/WebKit2
- Revision
- 214149
- Author
- jmarc...@apple.com
- Date
- 2017-03-19 18:31:52 -0700 (Sun, 19 Mar 2017)
Log Message
Merge r212726. rdar://problem/30921822
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (214148 => 214149)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-03-20 00:26:25 UTC (rev 214148)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-03-20 01:31:52 UTC (rev 214149)
@@ -1,3 +1,26 @@
+2017-03-16 Jason Marcell <jmarc...@apple.com>
+
+ Merge r212726. rdar://problem/30921822
+
+ 2017-02-21 Maureen Daum <md...@apple.com>
+
+ Check what LocalStorage data exists in deleteDatabasesModifiedSince() before attempting deletion.
+ https://bugs.webkit.org/show_bug.cgi?id=168659
+ rdar://problem/22781730
+
+ Reviewed by Brady Eidson.
+
+ Check what LocalStorage data exists in deleteDatabasesModifiedSince() before attempting deletion.
+ It is possible that another process has caused information to be added to LocalStorage
+ after we created this LocalStorageDatabaseTracker instance, so we should update our
+ internal state by checking the contents of StorageTracker.db and the other local
+ storage files so we know what databases actually exist. By calling importOriginIdentifiers()
+ at the start of deleteDatabasesModifiedSince(), m_origins will now have the up-to-date
+ list of origins LocalStorage contains data for.
+
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::deleteDatabasesModifiedSince):
+
2017-02-24 Matthew Hanson <matthew_han...@apple.com>
Rollout r212537. rdar://problem/30699480
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (214148 => 214149)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-03-20 00:26:25 UTC (rev 214148)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2017-03-20 01:31:52 UTC (rev 214149)
@@ -32,6 +32,7 @@
#include <WebCore/SecurityOrigin.h>
#include <WebCore/SecurityOriginData.h>
#include <WebCore/TextEncoding.h>
+#include <wtf/MainThread.h>
#include <wtf/WorkQueue.h>
#include <wtf/text/CString.h>
@@ -142,6 +143,8 @@
Vector<SecurityOriginData> LocalStorageDatabaseTracker::deleteDatabasesModifiedSince(std::chrono::system_clock::time_point time)
{
+ ASSERT(!isMainThread());
+ importOriginIdentifiers();
Vector<String> originIdentifiersToDelete;
for (const String& origin : m_origins) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
