<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172765] branches/safari-600.1-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172765">172765</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 15:18:32 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172603">r172603</a>. <rdar://problem/17989469></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreModulesindexeddbIDBFactorycpp">branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsstorageindexeddbopendbprivatebrowsingexpectedtxt">branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsstorageindexeddbopendbprivatebrowsinghtml">branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html</a></li>
<li><a href="#branchessafari6001branchLayoutTestsstorageindexeddbresourcesopendbprivatebrowsingjs">branches/safari-600.1-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172764 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 22:05:46 UTC (rev 172764)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-19 Dana Burkart <dburkart@apple.com>
+
+ Merge r172603
+
+ 2014-08-14 Martin Hock <mhock@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2014-08-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172534
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsstorageindexeddbopendbprivatebrowsingexpectedtxtfromrev172603trunkLayoutTestsstorageindexeddbopendbprivatebrowsingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt (from rev 172603, trunk/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt) (0 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing-expected.txt 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+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
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsstorageindexeddbopendbprivatebrowsinghtmlfromrev172603trunkLayoutTestsstorageindexeddbopendbprivatebrowsinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html (from rev 172603, trunk/LayoutTests/storage/indexeddb/open-db-private-browsing.html) (0 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/storage/indexeddb/open-db-private-browsing.html 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script src="resources/shared.js"></script>
+</head>
+<body>
+<script src="resources/open-db-private-browsing.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsstorageindexeddbresourcesopendbprivatebrowsingjsfromrev172603trunkLayoutTestsstorageindexeddbresourcesopendbprivatebrowsingjs"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js (from rev 172603, trunk/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js) (0 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/storage/indexeddb/resources/open-db-private-browsing.js 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+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();
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172764 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 22:05:46 UTC (rev 172764)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172603
+
+ 2014-08-14 Martin Hock <mhock@apple.com>
+
+ 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-19 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172600
</span><span class="cx">
</span><span class="cx"> 2014-08-14 Yoav Weiss <yoav@yoav.ws>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreModulesindexeddbIDBFactorycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (172764 => 172765)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2014-08-19 22:05:46 UTC (rev 172764)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2014-08-19 22:18:32 UTC (rev 172765)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageGroup.h"
</span><ins>+#include "SchemeRegistry.h"
</ins><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="cx"> #include "WorkerLoaderProxy.h"
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx"> ASSERT(context->isDocument() || context->isWorkerGlobalScope());
</span><span class="cx"> if (context->isDocument()) {
</span><span class="cx"> Document* document = toDocument(context);
</span><del>- return document->frame() && document->page();
</del><ins>+ return document->frame() && document->page() && (!document->page()->usesEphemeralSession() || SchemeRegistry::allowsDatabaseAccessInPrivateBrowsing(document->securityOrigin()->protocol()));
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>