<!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>[183867] 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/183867">183867</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-06 05:55:20 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DOMStorage exception and issue with sessionStorage
https://bugs.webkit.org/show_bug.cgi?id=144646
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-05-06
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::findStorageArea):
Return session storage if the identifier says not local storage.
Source/WebInspectorUI:
* UserInterface/Views/DOMStorageContentView.js:
(WebInspector.DOMStorageContentView):
(WebInspector.DOMStorageContentView.prototype._populate):
(WebInspector.DOMStorageContentView.prototype.reset): Deleted.
Always have the datagrid be available with a default sort.
(WebInspector.DOMStorageContentView.prototype._sortDataGrid.comparator):
(WebInspector.DOMStorageContentView.prototype._sortDataGrid):
Simplify and correct the order.
(WebInspector.DOMStorageContentView.prototype.cleanup):
Cleanup some uses of delete.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.sortNodesImmediately):
Provide a way to sort immediately without a visible delay.
(WebInspector.DataGrid.prototype._sortNodesCallback):
Cleanup some dead code to simplify sorting.
(WebInspector.DataGridNode.prototype._attach):
When sorting, the children list does not match the child node list,
so ensure that placeholder nodes are added to the end.
(WebInspector.PlaceholderDataGridNode.prototype.makeNormal):
Cleanup some uses of delete.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183866 => 183867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 11:59:41 UTC (rev 183866)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 12:55:20 UTC (rev 183867)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: DOMStorage exception and issue with sessionStorage
+ https://bugs.webkit.org/show_bug.cgi?id=144646
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::findStorageArea):
+ Return session storage if the identifier says not local storage.
+
</ins><span class="cx"> 2015-05-06 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Move ReadableStreamJSSource.h/.cpp to ReadableJSStream.h/.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (183866 => 183867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-05-06 11:59:41 UTC (rev 183866)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-05-06 12:55:20 UTC (rev 183867)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Storage.h"
</span><ins>+#include "StorageNamespace.h"
</ins><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="cx"> #include "VoidCallback.h"
</span><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><span class="lines">@@ -198,6 +199,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!isLocalStorage)
+ return m_pageAgent->page()->sessionStorage()->storageArea(targetFrame->document()->securityOrigin());
</ins><span class="cx"> return m_pageAgent->page()->storageNamespaceProvider().localStorageArea(*targetFrame->document());
</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 (183866 => 183867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-06 11:59:41 UTC (rev 183866)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-06 12:55:20 UTC (rev 183867)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: DOMStorage exception and issue with sessionStorage
+ https://bugs.webkit.org/show_bug.cgi?id=144646
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DOMStorageContentView.js:
+ (WebInspector.DOMStorageContentView):
+ (WebInspector.DOMStorageContentView.prototype._populate):
+ (WebInspector.DOMStorageContentView.prototype.reset): Deleted.
+ Always have the datagrid be available with a default sort.
+
+ (WebInspector.DOMStorageContentView.prototype._sortDataGrid.comparator):
+ (WebInspector.DOMStorageContentView.prototype._sortDataGrid):
+ Simplify and correct the order.
+
+ (WebInspector.DOMStorageContentView.prototype.cleanup):
+ Cleanup some uses of delete.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.sortNodesImmediately):
+ Provide a way to sort immediately without a visible delay.
+
+ (WebInspector.DataGrid.prototype._sortNodesCallback):
+ Cleanup some dead code to simplify sorting.
+
+ (WebInspector.DataGridNode.prototype._attach):
+ When sorting, the children list does not match the child node list,
+ so ensure that placeholder nodes are added to the end.
+
+ (WebInspector.PlaceholderDataGridNode.prototype.makeNormal):
+ Cleanup some uses of delete.
+
+2015-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: SourceCodeTextEditor shows "undefined" instead of resource content when pausing during resource load
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144662
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js (183866 => 183867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-05-06 11:59:41 UTC (rev 183866)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-05-06 12:55:20 UTC (rev 183867)
</span><span class="lines">@@ -35,7 +35,18 @@
</span><span class="cx"> representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemRemoved, this.itemRemoved, this);
</span><span class="cx"> representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemUpdated, this.itemUpdated, this);
</span><span class="cx">
</span><del>- this.reset();
</del><ins>+ var columns = {};
+ columns.key = {title: WebInspector.UIString("Key"), sortable: true};
+ columns.value = {title: WebInspector.UIString("Value"), sortable: true};
+
+ this._dataGrid = new WebInspector.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
+ this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
+ this._dataGrid.sortColumnIdentifier = "key";
+ this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
+
+ this.element.appendChild(this._dataGrid.element);
+
+ this._populate();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DOMStorageContentView.StyleClassName = "dom-storage";
</span><span class="lines">@@ -50,40 +61,6 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- reset: function()
- {
- this.representedObject.getEntries(function(error, entries) {
- if (error)
- return;
-
- if (!this._dataGrid) {
- var columns = {};
- columns.key = {title: WebInspector.UIString("Key"), sortable: true};
- columns.value = {title: WebInspector.UIString("Value"), sortable: true};
-
- this._dataGrid = new WebInspector.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
- this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
-
- this.element.appendChild(this._dataGrid.element);
- }
-
- console.assert(this._dataGrid);
-
- var nodes = [];
- for (var entry of entries) {
- if (!entry[0] || !entry[1])
- continue;
- var data = {key: entry[0], value: entry[1]};
- var node = new WebInspector.DataGridNode(data, false);
- this._dataGrid.appendChild(node);
- }
-
- this._sortDataGrid();
- this._dataGrid.addPlaceholderNode();
- this._dataGrid.updateLayout();
- }.bind(this));
- },
-
</del><span class="cx"> saveToCookie: function(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.DOMStorage;
</span><span class="lines">@@ -158,19 +135,37 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _sortDataGrid: function()
</del><ins>+ _populate: function()
</ins><span class="cx"> {
</span><del>- if (!this._dataGrid.sortOrder)
- return;
</del><ins>+ this.representedObject.getEntries(function(error, entries) {
+ if (error)
+ return;
</ins><span class="cx">
</span><ins>+ var nodes = [];
+ for (var entry of entries) {
+ if (!entry[0] || !entry[1])
+ continue;
+ var data = {key: entry[0], value: entry[1]};
+ var node = new WebInspector.DataGridNode(data, false);
+ this._dataGrid.appendChild(node);
+ }
+
+ this._sortDataGrid();
+ this._dataGrid.addPlaceholderNode();
+ this._dataGrid.updateLayout();
+ }.bind(this));
+ },
+
+ _sortDataGrid: function()
+ {
</ins><span class="cx"> var sortColumnIdentifier = this._dataGrid.sortColumnIdentifier || "key";
</span><span class="cx">
</span><span class="cx"> function comparator(a, b)
</span><span class="cx"> {
</span><del>- return b.data[sortColumnIdentifier].localeCompare(a.data[sortColumnIdentifier]);
</del><ins>+ return a.data[sortColumnIdentifier].localeCompare(b.data[sortColumnIdentifier]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- this._dataGrid.sortNodes(comparator, this._dataGrid.sortOrder);
</del><ins>+ this._dataGrid.sortNodesImmediately(comparator);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _deleteCallback: function(node)
</span><span class="lines">@@ -210,9 +205,9 @@
</span><span class="cx"> editingNode.element.classList.remove(WebInspector.DOMStorageContentView.MissingKeyStyleClassName);
</span><span class="cx"> editingNode.element.classList.remove(WebInspector.DOMStorageContentView.MissingValueStyleClassName);
</span><span class="cx"> editingNode.element.classList.remove(WebInspector.DOMStorageContentView.DuplicateKeyStyleClassName);
</span><del>- delete editingNode.__hasUncommittedEdits;
- delete editingNode.__originalKey;
- delete editingNode.__originalValue;
</del><ins>+ editingNode.__hasUncommittedEdits = undefined;
+ editingNode.__originalKey = undefined;
+ editingNode.__originalValue = undefined;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function restoreOriginalValues()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (183866 => 183867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2015-05-06 11:59:41 UTC (rev 183866)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2015-05-06 12:55:20 UTC (rev 183867)
</span><span class="lines">@@ -832,22 +832,28 @@
</span><span class="cx"> this._sortNodesRequestId = window.requestAnimationFrame(this._sortNodesCallback.bind(this, comparator));
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ sortNodesImmediately: function(comparator)
+ {
+ this._sortNodesCallback(comparator);
+ },
+
</ins><span class="cx"> _sortNodesCallback: function(comparator)
</span><span class="cx"> {
</span><span class="cx"> function comparatorWrapper(aRow, bRow)
</span><span class="cx"> {
</span><del>- var reverseFactor = this.sortOrder !== WebInspector.DataGrid.SortOrder.Ascending ? -1 : 1;
</del><span class="cx"> var aNode = aRow._dataGridNode;
</span><span class="cx"> var bNode = bRow._dataGridNode;
</span><del>- if (aNode._data.summaryRow || aNode.isPlaceholderNode)
</del><ins>+
+ if (aNode.isPlaceholderNode)
</ins><span class="cx"> return 1;
</span><del>- if (bNode._data.summaryRow || bNode.isPlaceholderNode)
</del><ins>+ if (bNode.isPlaceholderNode)
</ins><span class="cx"> return -1;
</span><span class="cx">
</span><ins>+ var reverseFactor = this.sortOrder !== WebInspector.DataGrid.SortOrder.Ascending ? -1 : 1;
</ins><span class="cx"> return reverseFactor * comparator(aNode, bNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- delete this._sortNodesRequestId;
</del><ins>+ this._sortNodesRequestId = undefined;
</ins><span class="cx">
</span><span class="cx"> if (this._editing) {
</span><span class="cx"> this._sortAfterEditingCallback = this.sortNodes.bind(this, comparator);
</span><span class="lines">@@ -1823,11 +1829,13 @@
</span><span class="cx">
</span><span class="cx"> var nextElement = null;
</span><span class="cx">
</span><del>- var previousGridNode = this.traversePreviousNode(true, true);
- if (previousGridNode && previousGridNode.element.parentNode)
- nextElement = previousGridNode.element.nextSibling;
- else if (!previousGridNode)
- nextElement = this.dataGrid.dataTableBodyElement.firstChild;
</del><ins>+ if (!this.isPlaceholderNode) {
+ var previousGridNode = this.traversePreviousNode(true, true);
+ if (previousGridNode && previousGridNode.element.parentNode)
+ nextElement = previousGridNode.element.nextSibling;
+ else if (!previousGridNode)
+ nextElement = this.dataGrid.dataTableBodyElement.firstChild;
+ }
</ins><span class="cx">
</span><span class="cx"> // If there is no next grid node, then append before the last child since the last child is the filler row.
</span><span class="cx"> console.assert(this.dataGrid.dataTableBodyElement.lastChild.classList.contains("filler"));
</span><span class="lines">@@ -1896,7 +1904,6 @@
</span><span class="cx">
</span><span class="cx"> makeNormal: function()
</span><span class="cx"> {
</span><del>- delete this.isPlaceholderNode;
- delete this.makeNormal;
</del><ins>+ this.isPlaceholderNode = false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>