<!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>[181613] 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/181613">181613</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 21:41:34 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Object Previews in Indexed DB tables
https://bugs.webkit.org/show_bug.cgi?id=140813
Reviewed by Timothy Hatcher.
Source/WebCore:
* inspector/InspectorIndexedDBAgent.cpp:
Include previews with object store objects.
Source/WebInspectorUI:
* UserInterface/Views/FormattedValue.js:
(WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject):
Add a boolean param for ObjectTree construction if it should force allowing object expansion.
* UserInterface/Views/IndexedDatabaseEntryDataGridNode.js:
(WebInspector.IndexedDatabaseEntryDataGridNode.prototype.createCellContent):
Switch to creating an ObjectTree or FormattedValue.
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.css:
(.content-view.indexed-database-object-store > .data-grid tr.selected):
Change row selection color to match the console's lighter blue instead of dark blue.
(.content-view.indexed-database-object-store > .data-grid .object-tree > :matches(.title, .object-preview)::before):
Adjust object tree disclosure triangle placement for larger line heights.
(.content-view.indexed-database-object-store > .data-grid td .section .header): Deleted.
(.content-view.indexed-database-object-store > .data-grid td .section .header::before): Deleted.
(.content-view.indexed-database-object-store > .data-grid td .section .header .title): Deleted.
(.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section .header::before): Deleted.
(.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section.expanded .header::before): Deleted.
(.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent::before): Deleted.
(.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent.expanded::before): Deleted.
(.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li *): Deleted.
Remove now unnecessary styles.
* UserInterface/Views/ObjectTreeArrayIndexTreeElement.css:
(.object-tree .object-tree-array-index > .icon):
Increase the specificity to override ".data-grid td .icon" styles.</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="#trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuejs">trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseEntryDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseEntryDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeArrayIndexTreeElementcss">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Object Previews in Indexed DB tables
+ https://bugs.webkit.org/show_bug.cgi?id=140813
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorIndexedDBAgent.cpp:
+ Include previews with object store objects.
+
</ins><span class="cx"> 2015-03-16 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Update missing image UI
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -470,9 +470,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DataEntry> dataEntry = DataEntry::create()
</span><del>- .setKey(m_injectedScript.wrapObject(idbCursor->key(), String()))
- .setPrimaryKey(m_injectedScript.wrapObject(idbCursor->primaryKey(), String()))
- .setValue(m_injectedScript.wrapObject(idbCursor->value(), String()))
</del><ins>+ .setKey(m_injectedScript.wrapObject(idbCursor->key(), String(), true))
+ .setPrimaryKey(m_injectedScript.wrapObject(idbCursor->primaryKey(), String(), true))
+ .setValue(m_injectedScript.wrapObject(idbCursor->value(), String(), true))
</ins><span class="cx"> .release();
</span><span class="cx"> m_result->addItem(WTF::move(dataEntry));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Object Previews in Indexed DB tables
+ https://bugs.webkit.org/show_bug.cgi?id=140813
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/FormattedValue.js:
+ (WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject):
+ Add a boolean param for ObjectTree construction if it should force allowing object expansion.
+
+ * UserInterface/Views/IndexedDatabaseEntryDataGridNode.js:
+ (WebInspector.IndexedDatabaseEntryDataGridNode.prototype.createCellContent):
+ Switch to creating an ObjectTree or FormattedValue.
+
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.css:
+ (.content-view.indexed-database-object-store > .data-grid tr.selected):
+ Change row selection color to match the console's lighter blue instead of dark blue.
+
+ (.content-view.indexed-database-object-store > .data-grid .object-tree > :matches(.title, .object-preview)::before):
+ Adjust object tree disclosure triangle placement for larger line heights.
+
+ (.content-view.indexed-database-object-store > .data-grid td .section .header): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid td .section .header::before): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid td .section .header .title): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section .header::before): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section.expanded .header::before): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent::before): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent.expanded::before): Deleted.
+ (.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li *): Deleted.
+ Remove now unnecessary styles.
+
+ * UserInterface/Views/ObjectTreeArrayIndexTreeElement.css:
+ (.object-tree .object-tree-array-index > .icon):
+ Increase the specificity to override ".data-grid td .icon" styles.
+
+2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Better Console Previews for Arrays / Small Objects
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142322
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFormattedValuejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FormattedValue.js 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -120,13 +120,13 @@
</span><span class="cx"> return WebInspector.FormattedValue.createElementForTypesAndValue(propertyPreview.type, propertyPreview.subtype, propertyPreview.value, undefined, true, false);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject = function(object, propertyPath)
</del><ins>+WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject = function(object, propertyPath, forceExpanding)
</ins><span class="cx"> {
</span><span class="cx"> if (object.subtype === "node")
</span><span class="cx"> return WebInspector.FormattedValue.createElementForNode(object);
</span><span class="cx">
</span><span class="cx"> if (object.type === "object") {
</span><del>- var objectTree = new WebInspector.ObjectTreeView(object, WebInspector.ObjectTreeView.Mode.Properties, propertyPath);
</del><ins>+ var objectTree = new WebInspector.ObjectTreeView(object, WebInspector.ObjectTreeView.Mode.Properties, propertyPath, forceExpanding);
</ins><span class="cx"> return objectTree.element;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseEntryDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseEntryDataGridNode.js (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseEntryDataGridNode.js 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseEntryDataGridNode.js 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -44,23 +44,9 @@
</span><span class="cx"> createCellContent: function(columnIdentifier, cell)
</span><span class="cx"> {
</span><span class="cx"> var value = this._entry[columnIdentifier];
</span><ins>+ if (value instanceof WebInspector.RemoteObject)
+ return WebInspector.FormattedValue.createObjectTreeOrFormattedValueForRemoteObject(value, null, true);
</ins><span class="cx">
</span><del>- if (value instanceof WebInspector.RemoteObject) {
- switch (value.type) {
- case "object":
- case "array":
- var propertiesSection = new WebInspector.ObjectPropertiesSection(value, value.description);
- propertiesSection.editable = false;
- return propertiesSection.element;
-
- case "string":
- return "\"" + value.description + "\"";
-
- default:
- return value.description;
- }
- }
-
</del><span class="cx"> return WebInspector.DataGridNode.prototype.createCellContent.call(this, columnIdentifier, cell);
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.css 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -31,20 +31,6 @@
</span><span class="cx"> bottom: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.indexed-database-object-store > .data-grid td .section .header {
- padding: 0 0 0 18px;
- min-height: initial;
- color: inherit;
-}
-
-.content-view.indexed-database-object-store > .data-grid td .section .header::before {
- top: 2px;
-}
-
-.content-view.indexed-database-object-store > .data-grid td .section .header .title {
- line-height: initial;
-}
-
</del><span class="cx"> .content-view.indexed-database-object-store > .data-grid table.data {
</span><span class="cx"> background-image: none;
</span><span class="cx"> }
</span><span class="lines">@@ -62,22 +48,15 @@
</span><span class="cx"> background-color: white;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section .header::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
</del><ins>+.content-view.indexed-database-object-store > .data-grid tr.selected {
+ background-color: hsl(210, 90%, 90%) !important;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .section.expanded .header::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
</del><ins>+.content-view.indexed-database-object-store > .data-grid:focus tr.selected td:not(:last-child) {
+ border-right-color: hsl(210, 70%, 75%);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
</del><ins>+.content-view.indexed-database-object-store > .data-grid .object-tree > :matches(.title, .object-preview)::before {
+ /* The line-height inside a data-grid is 17px instead of 13px, this will center vertically on the top line. */
+ top: 2px;
</ins><span class="cx"> }
</span><del>-
-.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li.parent.expanded::before {
- background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
-}
-
-.content-view.indexed-database-object-store > .data-grid:focus tr.selected td .properties-tree li * {
- color: inherit;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeArrayIndexTreeElementcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.css (181612 => 181613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.css 2015-03-17 04:41:31 UTC (rev 181612)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeArrayIndexTreeElement.css 2015-03-17 04:41:34 UTC (rev 181613)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> margin-bottom: 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.object-tree-array-index > .disclosure-button,
-.object-tree-array-index > .icon {
</del><ins>+.object-tree .object-tree-array-index > .disclosure-button,
+.object-tree .object-tree-array-index > .icon {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>