<!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>[201893] trunk/Source</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/201893">201893</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-09 16:48:08 -0700 (Thu, 09 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
https://bugs.webkit.org/show_bug.cgi?id=158592
<rdar://problem/26730696>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-06-09
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::DataLoader::execute):
Ensure the IDBTransaction is active when attempting to open a cursor.
(WebCore::OpenCursorCallback::handleEvent):
End, when the cursor result is empty, like we do for script results.
Source/WebInspectorUI:
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype._noteRowRemoved):
(WebInspector.DataGridNode.prototype._detach):
When rows are removed in the non-Virtual DataGrids, we should
actually remove the row.
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
(WebInspector.IndexedDatabaseObjectStoreContentView):
(WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData.processEntries):
(WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData):
Don't use the delete operator. Use a boolean.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201892 => 201893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebCore/ChangeLog 2016-06-09 23:48:08 UTC (rev 201893)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
+ https://bugs.webkit.org/show_bug.cgi?id=158592
+ <rdar://problem/26730696>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::DataLoader::execute):
+ Ensure the IDBTransaction is active when attempting to open a cursor.
+
+ (WebCore::OpenCursorCallback::handleEvent):
+ End, when the cursor result is empty, like we do for script results.
+
</ins><span class="cx"> 2016-06-09 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Changing canvas height immediately after page load does not relayout canvas
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (201892 => 201893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-06-09 23:48:08 UTC (rev 201893)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto* cursorResult = request.cursorResult();
</span><span class="cx"> if (!cursorResult) {
</span><del>- m_requestCallback->sendFailure("Unexpected result type.");
</del><ins>+ end(false);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -483,8 +483,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
-
</del><ins>+ TransactionActivator activator(idbTransaction.get());
</ins><span class="cx"> ExceptionCodeWithMessage ec;
</span><span class="cx"> RefPtr<IDBRequest> idbRequest;
</span><span class="cx"> if (!m_indexName.isEmpty()) {
</span><span class="lines">@@ -503,6 +502,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), 0, m_pageSize);
</ins><span class="cx"> idbRequest->addEventListener(eventNames().successEvent, WTFMove(openCursorCallback), false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201892 => 201893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-09 23:48:08 UTC (rev 201893)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION: Web Inspector: IndexedDB does not show ObjectStore data
+ https://bugs.webkit.org/show_bug.cgi?id=158592
+ <rdar://problem/26730696>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype._noteRowRemoved):
+ (WebInspector.DataGridNode.prototype._detach):
+ When rows are removed in the non-Virtual DataGrids, we should
+ actually remove the row.
+
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+ (WebInspector.IndexedDatabaseObjectStoreContentView):
+ (WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData.processEntries):
+ (WebInspector.IndexedDatabaseObjectStoreContentView.prototype._fetchMoreData):
+ Don't use the delete operator. Use a boolean.
+
</ins><span class="cx"> 2016-06-09 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Support Command-P for quick open
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (201892 => 201893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-06-09 23:48:08 UTC (rev 201893)
</span><span class="lines">@@ -1004,6 +1004,19 @@
</span><span class="cx"> this.needsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _noteRowRemoved(dataGridNode)
+ {
+ if (this._inline || this._variableHeightRows) {
+ // Inline DataGrids rows are not updated in layout, so
+ // we need to remove rows immediately.
+ if (dataGridNode.element && dataGridNode.element.parentNode)
+ dataGridNode.element.parentNode.removeChild(dataGridNode.element);
+ return;
+ }
+
+ this._noteRowsChanged();
+ }
+
</ins><span class="cx"> _noteScrollPositionChanged()
</span><span class="cx"> {
</span><span class="cx"> this._cachedScrollTop = NaN;
</span><span class="lines">@@ -2513,7 +2526,7 @@
</span><span class="cx"> this._attached = false;
</span><span class="cx">
</span><span class="cx"> this.dataGrid._rows.remove(this, true);
</span><del>- this.dataGrid._noteRowsChanged();
</del><ins>+ this.dataGrid._noteRowRemoved(this);
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < this.children.length; ++i)
</span><span class="cx"> this.children[i]._detach();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (201892 => 201893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-06-09 23:30:39 UTC (rev 201892)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2016-06-09 23:48:08 UTC (rev 201893)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx">
</span><span class="cx"> this._entries = [];
</span><span class="cx">
</span><ins>+ this._fetchingMoreData = false;
</ins><span class="cx"> this._fetchMoreData();
</span><span class="cx">
</span><span class="cx"> this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
</span><span class="lines">@@ -143,7 +144,7 @@
</span><span class="cx"> this._dataGrid.appendChild(dataGridNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- delete this._fetchingMoreData;
</del><ins>+ this._fetchingMoreData = false;
</ins><span class="cx">
</span><span class="cx"> if (moreAvailable && this._dataGrid.isScrolledToLastRow())
</span><span class="cx"> this._fetchMoreData();
</span></span></pre>
</div>
</div>
</body>
</html>