<!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>[193090] branches/safari-601-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/193090">193090</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:45:44 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188353">r188353</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceBaseTestjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js</a></li>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp">branches/safari-601-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-601-branch/LayoutTests/inspector/indexeddb/</li>
<li><a href="#branchessafari601branchLayoutTestsinspectorindexeddbrequestDatabaseNamesexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectorindexeddbrequestDatabaseNameshtml">branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193089 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:45:36 UTC (rev 193089)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188353. rdar://problem/23221163
+
+ 2015-08-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Not receiving responses for async request IndexedDB.requestDatabaseNames
+ https://bugs.webkit.org/show_bug.cgi?id=147844
+
+ Reviewed by Brian Burg.
+
+ * inspector/indexeddb/requestDatabaseNames-expected.txt: Added.
+ * inspector/indexeddb/requestDatabaseNames.html: Added.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188283. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-11 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorindexeddbrequestDatabaseNamesexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames-expected.txt (0 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames-expected.txt 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+CONSOLE MESSAGE: line 10: Created Database 'Database1'
+CONSOLE MESSAGE: line 10: Created Database 'Database2'
+
+PASS: No IndexedDB databases should exist initially
+Created Database 'Database1'
+PASS: A single IndexedDB database should exist
+["Database1"]
+Created Database 'Database2'
+PASS: Two IndexedDB databases should exist
+["Database1","Database2"]
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorindexeddbrequestDatabaseNameshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames.html (0 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/indexeddb/requestDatabaseNames.html 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function createDatabase(name)
+{
+ var request = window.indexedDB.open(name, 1);
+ request.addEventListener('success', function() {
+ console.log(`Created Database '${name}'`);
+ });
+}
+
+function test()
+{
+ var steps = [
+ {
+ action: function() {
+ IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, function(error, names) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(names.length === 0, "No IndexedDB databases should exist initially");
+ InspectorTest.evaluateInPage("createDatabase('Database1')");
+ });
+ }
+ },
+ {
+ action: function() {
+ IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, function(error, names) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(names.length === 1, "A single IndexedDB database should exist");
+ InspectorTest.log(JSON.stringify(names));
+ InspectorTest.evaluateInPage("createDatabase('Database2')");
+ });
+ }
+ },
+ {
+ action: function() {
+ IndexedDBAgent.requestDatabaseNames(WebInspector.frameResourceManager.mainFrame.securityOrigin, function(error, names) {
+ InspectorTest.expectNoError(error);
+ InspectorTest.expectThat(names.length === 2, "Two IndexedDB databases should exist");
+ InspectorTest.log(JSON.stringify(names));
+ next();
+ });
+ }
+ }
+ ];
+
+ function next() {
+ var step = steps.shift();
+ if (!step) {
+ InspectorTest.completeTest();
+ return;
+ }
+ step.action();
+ }
+
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, function(event) {
+ InspectorTest.log(event.data.message.messageText);
+ next();
+ });
+
+ InspectorTest.log("");
+ next();
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations (193089 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-03 18:45:36 UTC (rev 193089)
+++ branches/safari-601-branch/LayoutTests/platform/mac-wk1/TestExpectations 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> http/tests/security/no-indexeddb-from-sandbox.html
</span><span class="cx"> crypto/subtle/rsa-indexeddb.html
</span><span class="cx"> crypto/subtle/rsa-indexeddb-non-exportable.html
</span><ins>+inspector/indexeddb
</ins><span class="cx">
</span><span class="cx"> # But since it is disabled at runtime, we should make sure it is correctly disabled
</span><span class="cx"> storage/indexeddb/properties-disabled-at-runtime.html [ Pass ]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceBaseTestjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js (193089 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-12-03 18:45:36 UTC (rev 193089)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Base/Test.js 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -155,6 +155,16 @@
</span><span class="cx"> this.evaluateInPage("InspectorTestProxy.debugLog(unescape('" + escape(JSON.stringify(message)) + "'))");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Appends a message in the test document if there was an error, and attempts to complete the test.
+InspectorTest.expectNoError = function(error)
+{
+ if (error) {
+ InspectorTest.log("PROTOCOL ERROR: " + error);
+ InspectorTest.completeTest();
+ throw "PROTOCOL ERROR";
+ }
+}
+
</ins><span class="cx"> InspectorTest.completeTest = function()
</span><span class="cx"> {
</span><span class="cx"> if (InspectorTest.dumpMessagesToConsole)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193089 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-03 18:45:36 UTC (rev 193089)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
+ Merge r188353. rdar://problem/23221163
+
+ 2015-08-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Not receiving responses for async request IndexedDB.requestDatabaseNames
+ https://bugs.webkit.org/show_bug.cgi?id=147844
+
+ Reviewed by Brian Burg.
+
+ * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
+ (WebKit::WebIDBFactoryBackend::getDatabaseNames):
+ This method should not return without calling either the success
+ or error callbacks. In this case, it can succeed with an empty list.
+
</ins><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186724. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp (193089 => 193090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2015-12-03 18:45:36 UTC (rev 193089)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2015-12-03 18:45:44 UTC (rev 193090)
</span><span class="lines">@@ -98,15 +98,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto recentNameIterator = sharedRecentDatabaseNameMap().find(securityOriginIdentifier);
- if (recentNameIterator == sharedRecentDatabaseNameMap().end())
- return;
-
</del><span class="cx"> RefPtr<DOMStringList> databaseNames = DOMStringList::create();
</span><span class="cx">
</span><del>- HashSet<String>& foundNames = recentNameIterator->value;
- for (const String& name : foundNames)
- databaseNames->append(name);
</del><ins>+ auto recentNameIterator = sharedRecentDatabaseNameMap().find(securityOriginIdentifier);
+ if (recentNameIterator != sharedRecentDatabaseNameMap().end()) {
+ HashSet<String>& foundNames = recentNameIterator->value;
+ for (const String& name : foundNames)
+ databaseNames->append(name);
+ }
</ins><span class="cx">
</span><span class="cx"> callbacks->onSuccess(databaseNames.release());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>