Title: [172652] branches/safari-600.1.4.11-branch
- Revision
- 172652
- Author
- [email protected]
- Date
- 2014-08-15 14:16:21 -0700 (Fri, 15 Aug 2014)
Log Message
Merge r172603. <rdar://problem/18008488>
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog (172651 => 172652)
--- branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog 2014-08-15 21:14:14 UTC (rev 172651)
+++ branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog 2014-08-15 21:16:21 UTC (rev 172652)
@@ -1,3 +1,19 @@
+2014-08-15 Matthew Hanson <[email protected]>
+
+ Merge r172603. <rdar://problem/18008488>
+
+ 2014-08-14 Martin Hock <[email protected]>
+
+ IndexedDB should respect SchemeRegistry's database access setting.
+ https://bugs.webkit.org/show_bug.cgi?id=135890
+ <rdar://problem/17989469>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * storage/indexeddb/open-db-private-browsing-expected.txt: Added.
+ * storage/indexeddb/open-db-private-browsing.html: Added. Simple test to open database in private browsing mode.
+ * storage/indexeddb/resources/open-db-private-browsing.js: Added.
+
2014-08-15 Lucas Forschler <[email protected]>
Merge r171675
Copied: branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt (from rev 172603, trunk/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt) (0 => 172652)
--- branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt (rev 0)
+++ branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt 2014-08-15 21:16:21 UTC (rev 172652)
@@ -0,0 +1,12 @@
+Simple test to open IndexedDB database in private browsing mode.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+PASS indexedDB.open('db') is null
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html (from rev 172603, trunk/LayoutTests/storage/indexeddb/open-db-private-browsing.html) (0 => 172652)
--- branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html (rev 0)
+++ branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html 2014-08-15 21:16:21 UTC (rev 172652)
@@ -0,0 +1,9 @@
+<html>
+<head>
+<script src=""
+<script src=""
+</head>
+<body>
+<script src=""
+</body>
+</html>
Copied: branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js (from rev 172603, trunk/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js) (0 => 172652)
--- branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js (rev 0)
+++ branches/safari-600.1.4.11-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js 2014-08-15 21:16:21 UTC (rev 172652)
@@ -0,0 +1,11 @@
+if (this.importScripts) {
+ importScripts('../../../resources/js-test.js');
+ importScripts('shared.js');
+}
+
+description("Simple test to open IndexedDB database in private browsing mode.");
+
+testRunner.setPrivateBrowsingEnabled(true);
+removeVendorPrefixes();
+shouldBeNull("indexedDB.open('db')");
+finishJSTest();
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog (172651 => 172652)
--- branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-08-15 21:14:14 UTC (rev 172651)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-08-15 21:16:21 UTC (rev 172652)
@@ -1,3 +1,19 @@
+2014-08-15 Matthew Hanson <[email protected]>
+
+ Merge r172603. <rdar://problem/18008488>
+
+ 2014-08-14 Martin Hock <[email protected]>
+
+ IndexedDB should respect SchemeRegistry's database access setting.
+ https://bugs.webkit.org/show_bug.cgi?id=135890
+ <rdar://problem/17989469>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Test: storage/indexeddb/open-db-private-browsing.html
+
+ * Modules/indexeddb/IDBFactory.cpp:
+
2014-08-15 Lucas Forschler <[email protected]>
Merge r172502
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (172651 => 172652)
--- branches/safari-600.1.4.11-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2014-08-15 21:14:14 UTC (rev 172651)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2014-08-15 21:16:21 UTC (rev 172652)
@@ -46,6 +46,7 @@
#include "Logging.h"
#include "Page.h"
#include "PageGroup.h"
+#include "SchemeRegistry.h"
#include "SecurityOrigin.h"
#include "WorkerGlobalScope.h"
#include "WorkerLoaderProxy.h"
@@ -70,7 +71,7 @@
ASSERT(context->isDocument() || context->isWorkerGlobalScope());
if (context->isDocument()) {
Document* document = toDocument(context);
- return document->frame() && document->page();
+ return document->frame() && document->page() && (!document->page()->usesEphemeralSession() || SchemeRegistry::allowsDatabaseAccessInPrivateBrowsing(document->securityOrigin()->protocol()));
}
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
