<!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>[179349] trunk</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/179349">179349</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-29 11:25:16 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ES6: Improved Console Format for Set and Map Objects (like Arrays)
https://bugs.webkit.org/show_bug.cgi?id=122867
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
Add new Runtime.RemoteObject object subtypes for "map", "set", and "weakmap".
Upgrade Runtime.ObjectPreview to include type/subtype information. Now,
an ObjectPreview can be used for any value, in place of a RemoteObject,
and not capture / hold a reference to the value. The value will be in
the string description.
Adding this information to ObjectPreview can duplicate some information
in the protocol messages if a preview is provided, but simplifies
previews, so that all the information you need for any RemoteObject
preview is available. To slim messages further, make "overflow" and
"properties" only available on previews that may contain properties.
So, not primitives or null.
Finally, for "Map/Set/WeakMap" add an "entries" list to the preview
that will return previews with "key" and "value" properties depending
on the collection type. To get live, non-preview objects from a
collection, use Runtime.getCollectionEntries.
In order to keep the WeakMap's values Weak the frontend may provide
a unique object group name when getting collection entries. It may
then release that object group, e.g. when not showing the WeakMap's
values to the user, and thus remove the strong reference to the keys
so they may be garbage collected.
* runtime/WeakMapData.h:
(JSC::WeakMapData::begin):
(JSC::WeakMapData::end):
Expose iterators so the Inspector may access WeakMap keys/values.
* inspector/JSInjectedScriptHostPrototype.cpp:
(Inspector::JSInjectedScriptHostPrototype::finishCreation):
(Inspector::jsInjectedScriptHostPrototypeFunctionWeakMapEntries):
* inspector/JSInjectedScriptHost.h:
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::subtype):
Discern "map", "set", and "weakmap" object subtypes.
(Inspector::JSInjectedScriptHost::weakMapEntries):
Return a list of WeakMap entries. These are strong references
that the Inspector code is responsible for releasing.
* inspector/protocol/Runtime.json:
Update types and expose the new getCollectionEntries command.
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::getCollectionEntries):
* inspector/InjectedScript.h:
* inspector/InjectedScript.cpp:
(Inspector::InjectedScript::getInternalProperties):
(Inspector::InjectedScript::getCollectionEntries):
Pass through to the InjectedScript and call getCollectionEntries.
* inspector/scripts/codegen/generator.py:
Add another type with runtime casting.
* inspector/InjectedScriptSource.js:
- Implement getCollectionEntries to get a range of values from a
collection. The non-Weak collections have an order to their keys (in
order of added) so range'd gets are okay. WeakMap does not have an
order, so only allow fetching a number of values.
- Update preview generation to address the Runtime.ObjectPreview
type changes.
Source/WebInspectorUI:
This includes Set/Map/WeakMap previews:
- Set previews: Set {1, 2, 3}
- Map/WeakMap previews: Map {1 => 2, "key" => "value"}
For WeakMaps:
- the preview itself shows up to 5 key/value pairs from when the object was logged
- the previews are strings only, and thus do not retain the actual keys/values
- when expanding, we get RemoteObjects and strongly retain the keys/values
- when collapsing / clearing, we release the RemoteObjects so they can get collected
Currently you collapse the <entries> section, and re-expand later the
collection may show you knew keys/values. The UI for this will change.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Protocol/RemoteObject.js:
(WebInspector.RemoteObject.prototype.isCollectionType):
(WebInspector.RemoteObject.prototype.isWeakCollection):
(WebInspector.RemoteObject.prototype.getCollectionEntries):
(WebInspector.RemoteObject.prototype.releaseWeakCollectionEntries):
(WebInspector.RemoteObject.prototype.arrayLength):
(WebInspector.RemoteObject.prototype._weakCollectionObjectGroup):
High level functions for dealing with a RemoteObject that may be a
collection / weak collection.
* UserInterface/Views/ConsoleMessageImpl.js:
(WebInspector.ConsoleMessageImpl):
(WebInspector.ConsoleMessageImpl.prototype._formatParameterAsObject):
Include default formatters for collection types.
(WebInspector.ConsoleMessageImpl.prototype._appendPreview):
(WebInspector.ConsoleMessageImpl.prototype._appendEntryPreviews):
(WebInspector.ConsoleMessageImpl.prototype._appendPropertyPreviews):
(WebInspector.ConsoleMessageImpl.prototype._appendValuePreview):
(WebInspector.ConsoleMessageImpl.prototype._appendObjectPreview): Deleted.
Refactor preview generation a bit and include a specific path for
generation the output of a preview with "entries".
* UserInterface/Views/LogContentView.css:
(.console-object-preview-body .console-object-preview-name.console-object-preview-name-Object):
With nested Object previews ("Map {{a:1} => 1}") don't show "Object" for the inner
object preview. Only show it if it has a unique type ("Map {Foo {a:1} => 1}")
(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap):
(:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .section):
(:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .properties):
Make map/set/weakmap display like Objects.
* UserInterface/Views/ObjectPropertiesSection.js:
(WebInspector.ObjectPropertiesSection.prototype.update):
(WebInspector.ObjectPropertiesSection.prototype.updateProperties):
(WebInspector.ObjectPropertyTreeElement.prototype.onpopulate.callback):
(WebInspector.ObjectPropertyTreeElement.prototype.onpopulate):
(WebInspector.CollectionEntriesMainTreeElement):
(WebInspector.CollectionEntriesMainTreeElement.prototype.onexpand.callback):
(WebInspector.CollectionEntriesMainTreeElement.prototype.onexpand):
(WebInspector.CollectionEntriesMainTreeElement.prototype.oncollapse):
(WebInspector.CollectionEntriesMainTreeElement.prototype.ondetach):
(WebInspector.CollectionEntriesMainTreeElement.prototype._trackWeakEntries):
(WebInspector.CollectionEntriesMainTreeElement.prototype._untrackWeakEntries):
(WebInspector.CollectionEntryTreeElement):
(WebInspector.CollectionEntryTreeElement.prototype.onpopulate):
(WebInspector.CollectionEntryTreeElement.prototype.onattach):
(WebInspector.EmptyCollectionTreeElement):
(WebInspector.ObjectPropertiesSection.prototype.update.callback): Deleted.
Add a quick UI for exploring the entries of a collection. We are actively
changing the styles of objects in the Console, so this should change soon.
LayoutTests:
* TestExpectations:
The test unexpectedly fails in Debug builds, so skip it.
* inspector/model/remote-object-expected.txt:
* inspector/model/remote-object.html:
Update based on Runtime.ObjectPreview changes.
* inspector/model/remote-object-weak-collection-expected.txt: Added.
* inspector/model/remote-object-weak-collection.html: Added.
New test for weak collection handling.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjecthtml">trunk/LayoutTests/inspector/model/remote-object.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptcpp">trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScripth">trunk/Source/JavaScriptCore/inspector/InjectedScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHosth">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostPrototypecpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolRuntimejson">trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapDatah">trunk/Source/JavaScriptCore/runtime/WeakMapData.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageImpljs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectPropertiesSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectweakcollectionexpectedtxt">trunk/LayoutTests/inspector/model/remote-object-weak-collection-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectormodelremoteobjectweakcollectionhtml">trunk/LayoutTests/inspector/model/remote-object-weak-collection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/LayoutTests/ChangeLog 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ES6: Improved Console Format for Set and Map Objects (like Arrays)
+ https://bugs.webkit.org/show_bug.cgi?id=122867
+
+ Reviewed by Timothy Hatcher.
+
+ * TestExpectations:
+ Inspector tests are still flakey on bots, so skip the test.
+
+ * inspector/model/remote-object-expected.txt:
+ * inspector/model/remote-object.html:
+ Update based on Runtime.ObjectPreview changes.
+
+ * inspector/model/remote-object-weak-collection-expected.txt: Added.
+ * inspector/model/remote-object-weak-collection.html: Added.
+ New test for weak collection handling.
+
</ins><span class="cx"> 2015-01-28 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> security/mixedContent/redirect-https-to-http-iframe-in-main-frame test is the same as security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/LayoutTests/TestExpectations 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> webkit.org/b/137130 inspector/replay [ Skip ]
</span><span class="cx"> webkit.org/b/137131 inspector/timeline [ Skip ]
</span><span class="cx"> inspector/model/remote-object-get-properties.html [ Skip ]
</span><ins>+inspector/model/remote-object-weak-collection.html [ Skip ]
</ins><span class="cx"> inspector/model/remote-object.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # Doesn't work yet, relies on network replay functionality (webkit.org/b/130728, webkit.org/b/129391)
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -231,7 +231,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/ /",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/ /",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -271,7 +274,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/(?:)/",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/(?:)/",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -311,7 +317,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/^r(e)g[e]{1,}x+/",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/^r(e)g[e]{1,}x+/",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -351,7 +360,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/^r(e)g[e]{1,}x+/gi",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/^r(e)g[e]{1,}x+/gi",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -391,7 +403,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/(?:)/",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/(?:)/",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -431,7 +446,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "/test/i",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "/test/i",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "regexp",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -471,7 +489,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[0]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[0]",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="lines">@@ -485,7 +506,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[2]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[2]",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -510,7 +534,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[3]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[3]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -543,7 +570,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[5]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[5]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -577,6 +607,63 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: [{a:1}, {b:2}, {c:2}]
+{
+ "_type": "object",
+ "_subtype": "array",
+ "_objectId": "<filtered>",
+ "_description": "Array[3]",
+ "_preview": {
+ "type": "object",
+ "description": "Array[3]",
+ "lossless": false,
+ "subtype": "array",
+ "overflow": false,
+ "properties": [
+ {
+ "name": "0",
+ "type": "object",
+ "value": "Object"
+ },
+ {
+ "name": "1",
+ "type": "object",
+ "value": "Object"
+ },
+ {
+ "name": "2",
+ "type": "object",
+ "value": "Object"
+ }
+ ]
+ }
+}
+
+-----------------------------------------------------
+EXPRESSION: [[{a:1}, {b:2}, {c:2}]]
+{
+ "_type": "object",
+ "_subtype": "array",
+ "_objectId": "<filtered>",
+ "_description": "Array[1]",
+ "_preview": {
+ "type": "object",
+ "description": "Array[1]",
+ "lossless": false,
+ "subtype": "array",
+ "overflow": false,
+ "properties": [
+ {
+ "name": "0",
+ "type": "object",
+ "subtype": "array",
+ "value": "Array[3]"
+ }
+ ]
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: arr = []; arr.length = 100; arr
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><span class="lines">@@ -584,7 +671,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[100]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[100]",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="lines">@@ -598,7 +688,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[100]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[100]",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1113,7 +1206,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Array[100]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Array[100]",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1133,7 +1229,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Arguments[3]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Arguments[3]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1164,7 +1263,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Int32Array[4]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Int32Array[4]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1214,7 +1316,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Int32Array[4]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Int32Array[4]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1263,8 +1368,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1276,8 +1382,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "a",
</span><span class="lines">@@ -1295,8 +1402,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": false,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "a",
</span><span class="lines">@@ -1325,8 +1433,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": false,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "a",
</span><span class="lines">@@ -1357,8 +1466,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Foo",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Foo",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1370,8 +1480,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Bar",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Bar",
</ins><span class="cx"> "lossless": false,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "_x",
</span><span class="lines">@@ -1398,8 +1509,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Event",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Event",
</ins><span class="cx"> "lossless": false,
</span><del>- "overflow": true,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "clipboardData",
</span><span class="lines">@@ -1427,7 +1539,8 @@
</span><span class="cx"> "type": "number",
</span><span class="cx"> "value": "2"
</span><span class="cx"> }
</span><del>- ]
</del><ins>+ ],
+ "overflow": true
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1438,8 +1551,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "ArrayBuffer",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "ArrayBuffer",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "byteLength",
</span><span class="lines">@@ -1457,8 +1571,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "DataView",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "DataView",
</ins><span class="cx"> "lossless": false,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="cx"> "name": "byteOffset",
</span><span class="lines">@@ -1487,7 +1602,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "body",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "body",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "node",
</ins><span class="cx"> "overflow": true,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1527,7 +1645,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "div.foo.bar",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "div.foo.bar",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "node",
</ins><span class="cx"> "overflow": true,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1567,7 +1688,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "span#foo",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "span#foo",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "node",
</ins><span class="cx"> "overflow": true,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1607,7 +1731,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "#text",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "#text",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "node",
</ins><span class="cx"> "overflow": true,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1647,7 +1774,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "HTMLCollection[3]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "HTMLCollection[3]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1690,7 +1820,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "NodeList[3]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "NodeList[3]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1733,7 +1866,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "NodeList[3]",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "NodeList[3]",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "array",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1776,7 +1912,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "TypeError: undefined is not an object (evaluating '[].x.x')",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "TypeError: undefined is not an object (evaluating '[].x.x')",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "error",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1811,7 +1950,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "SyntaxError: Unexpected token ')'",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "SyntaxError: Unexpected token ')'",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "error",
</ins><span class="cx"> "overflow": false,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1846,7 +1988,10 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Error: IndexSizeError: DOM Exception 1",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Error: IndexSizeError: DOM Exception 1",
</ins><span class="cx"> "lossless": false,
</span><ins>+ "subtype": "error",
</ins><span class="cx"> "overflow": true,
</span><span class="cx"> "properties": [
</span><span class="cx"> {
</span><span class="lines">@@ -1885,8 +2030,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1898,8 +2044,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Object",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Object",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1908,12 +2055,17 @@
</span><span class="cx"> EXPRESSION: new Map
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "map",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Map",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Map",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "map",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": []
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1921,12 +2073,42 @@
</span><span class="cx"> EXPRESSION: map = new Map; map.set(1, 2); map.set('key', 'value'); map
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "map",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Map",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Map",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "map",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": [
+ {
+ "key": {
+ "type": "number",
+ "description": "1",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "2",
+ "lossless": true
+ }
+ },
+ {
+ "key": {
+ "type": "string",
+ "description": "key",
+ "lossless": true
+ },
+ "value": {
+ "type": "string",
+ "description": "value",
+ "lossless": true
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1934,12 +2116,99 @@
</span><span class="cx"> EXPRESSION: map = new Map; map.set({a:1}, {b:2}); map.set(document.body, [1,2]); map
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "map",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Map",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Map",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "map",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": [
+ {
+ "key": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "a",
+ "type": "number",
+ "value": "1"
+ }
+ ]
+ },
+ "value": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "b",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ },
+ {
+ "key": {
+ "type": "object",
+ "description": "body",
+ "lossless": false,
+ "subtype": "node",
+ "overflow": true,
+ "properties": [
+ {
+ "name": "aLink",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "background",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "bgColor",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "link",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "text",
+ "type": "string",
+ "value": ""
+ }
+ ]
+ },
+ "value": {
+ "type": "object",
+ "description": "Array[2]",
+ "lossless": true,
+ "subtype": "array",
+ "overflow": false,
+ "properties": [
+ {
+ "name": "0",
+ "type": "number",
+ "value": "1"
+ },
+ {
+ "name": "1",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1947,25 +2216,130 @@
</span><span class="cx"> EXPRESSION: map = new Map; for (var i = 0; i <= 100; i++) map.set(i, i); map
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "map",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Map",
</span><span class="cx"> "_preview": {
</span><del>- "lossless": true,
- "overflow": false,
- "properties": []
</del><ins>+ "type": "object",
+ "description": "Map",
+ "lossless": false,
+ "subtype": "map",
+ "overflow": true,
+ "properties": [],
+ "entries": [
+ {
+ "key": {
+ "type": "number",
+ "description": "0",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "0",
+ "lossless": true
+ }
+ },
+ {
+ "key": {
+ "type": "number",
+ "description": "1",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "1",
+ "lossless": true
+ }
+ },
+ {
+ "key": {
+ "type": "number",
+ "description": "2",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "2",
+ "lossless": true
+ }
+ },
+ {
+ "key": {
+ "type": "number",
+ "description": "3",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "3",
+ "lossless": true
+ }
+ },
+ {
+ "key": {
+ "type": "number",
+ "description": "4",
+ "lossless": true
+ },
+ "value": {
+ "type": "number",
+ "description": "4",
+ "lossless": true
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><del>-EXPRESSION: map = new WeakMap; map.set({id:1}, [1,2]); map
</del><ins>+EXPRESSION: map = new WeakMap; strongKey = {id:1}; map.set(strongKey, [1,2]); map
</ins><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "weakmap",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "WeakMap",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "WeakMap",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "weakmap",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": [
+ {
+ "key": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "id",
+ "type": "number",
+ "value": "1"
+ }
+ ]
+ },
+ "value": {
+ "type": "object",
+ "description": "Array[2]",
+ "lossless": true,
+ "subtype": "array",
+ "overflow": false,
+ "properties": [
+ {
+ "name": "0",
+ "type": "number",
+ "value": "1"
+ },
+ {
+ "name": "1",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1973,12 +2347,17 @@
</span><span class="cx"> EXPRESSION: new Set
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "set",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Set",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Set",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "set",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": []
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1986,12 +2365,39 @@
</span><span class="cx"> EXPRESSION: set = new Set; set.add(1); set.add(2); set.add('key'); set
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "set",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Set",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Set",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "set",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": [
+ {
+ "value": {
+ "type": "number",
+ "description": "1",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "number",
+ "description": "2",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "string",
+ "description": "key",
+ "lossless": true
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1999,12 +2405,89 @@
</span><span class="cx"> EXPRESSION: set = new Set; set.add({a:1}); set.add(document.body); set.add([1,2]); set
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "set",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Set",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Set",
</ins><span class="cx"> "lossless": true,
</span><ins>+ "subtype": "set",
</ins><span class="cx"> "overflow": false,
</span><del>- "properties": []
</del><ins>+ "properties": [],
+ "entries": [
+ {
+ "value": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "a",
+ "type": "number",
+ "value": "1"
+ }
+ ]
+ }
+ },
+ {
+ "value": {
+ "type": "object",
+ "description": "body",
+ "lossless": false,
+ "subtype": "node",
+ "overflow": true,
+ "properties": [
+ {
+ "name": "aLink",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "background",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "bgColor",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "link",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "text",
+ "type": "string",
+ "value": ""
+ }
+ ]
+ }
+ },
+ {
+ "value": {
+ "type": "object",
+ "description": "Array[2]",
+ "lossless": true,
+ "subtype": "array",
+ "overflow": false,
+ "properties": [
+ {
+ "name": "0",
+ "type": "number",
+ "value": "1"
+ },
+ {
+ "name": "1",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2012,12 +2495,53 @@
</span><span class="cx"> EXPRESSION: set = new Set; for (var i = 0; i <= 100; i++) set.add(i); set
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><ins>+ "_subtype": "set",
</ins><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Set",
</span><span class="cx"> "_preview": {
</span><del>- "lossless": true,
- "overflow": false,
- "properties": []
</del><ins>+ "type": "object",
+ "description": "Set",
+ "lossless": false,
+ "subtype": "set",
+ "overflow": true,
+ "properties": [],
+ "entries": [
+ {
+ "value": {
+ "type": "number",
+ "description": "0",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "number",
+ "description": "1",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "number",
+ "description": "2",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "number",
+ "description": "3",
+ "lossless": true
+ }
+ },
+ {
+ "value": {
+ "type": "number",
+ "description": "4",
+ "lossless": true
+ }
+ }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2028,8 +2552,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Promise",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Promise",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2041,8 +2566,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Promise",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Promise",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2054,8 +2580,9 @@
</span><span class="cx"> "_objectId": "<filtered>",
</span><span class="cx"> "_description": "Promise",
</span><span class="cx"> "_preview": {
</span><ins>+ "type": "object",
+ "description": "Promise",
</ins><span class="cx"> "lossless": true,
</span><del>- "overflow": false,
</del><span class="cx"> "properties": []
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectweakcollectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/model/remote-object-weak-collection-expected.txt (0 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-weak-collection-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/model/remote-object-weak-collection-expected.txt 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -0,0 +1,129 @@
</span><ins>+
+-----------------------------------------------------
+EXPRESSION: weakMap
+ENTRIES:
+[]
+
+-----------------------------------------------------
+EXPRESSION: weakMap.set(strongKey1, 1); weakMap.set(strongKey2, 2); weakMap
+ENTRIES:
+[
+ {
+ "key": {
+ "type": "object",
+ "objectId": "<filtered>",
+ "className": "Object",
+ "description": "Object",
+ "preview": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "id",
+ "type": "number",
+ "value": "1"
+ }
+ ]
+ }
+ },
+ "value": {
+ "type": "number",
+ "value": 1,
+ "description": "1"
+ }
+ },
+ {
+ "key": {
+ "type": "object",
+ "objectId": "<filtered>",
+ "className": "Object",
+ "description": "Object",
+ "preview": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "id",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ },
+ "value": {
+ "type": "number",
+ "value": 2,
+ "description": "2"
+ }
+ }
+]
+
+-----------------------------------------------------
+EXPRESSION: delete window.strongKey1; weakMap
+ENTRIES:
+[
+ {
+ "key": {
+ "type": "object",
+ "objectId": "<filtered>",
+ "className": "Object",
+ "description": "Object",
+ "preview": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "id",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ },
+ "value": {
+ "type": "number",
+ "value": 2,
+ "description": "2"
+ }
+ }
+]
+
+-----------------------------------------------------
+EXPRESSION: weakMap.set({id:3}, 3); weakMap.set({id:4}, 4); weakMap
+ENTRIES:
+[
+ {
+ "key": {
+ "type": "object",
+ "objectId": "<filtered>",
+ "className": "Object",
+ "description": "Object",
+ "preview": {
+ "type": "object",
+ "description": "Object",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "id",
+ "type": "number",
+ "value": "2"
+ }
+ ]
+ }
+ },
+ "value": {
+ "type": "number",
+ "value": 2,
+ "description": "2"
+ }
+ }
+]
+
+-----------------------------------------------------
+EXPRESSION: delete window.strongKey2; weakMap
+ENTRIES:
+[]
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectweakcollectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/model/remote-object-weak-collection.html (0 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-weak-collection.html (rev 0)
+++ trunk/LayoutTests/inspector/model/remote-object-weak-collection.html 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+strongKey1 = {id:1};
+strongKey2 = {id:2};
+weakMap = new WeakMap;
+
+function test()
+{
+ var weakMapObjectId = null;
+
+ var currentStepIndex = 0;
+ var steps = [
+ // WeakMap {}
+ {expression: ""},
+
+ // WeakMap {key1 => 1, key2 => 2}
+ {expression: "weakMap.set(strongKey1, 1); weakMap.set(strongKey2, 2);"},
+
+ // WeakMap {key2 => 2}
+ {expression: "delete window.strongKey1;"},
+
+ // WeakMap {key2 => 2} (add and immediately garbage collect temporary objects)
+ {expression: "weakMap.set({id:3}, 3); weakMap.set({id:4}, 4);"},
+
+ // WeakMap {}
+ {expression: "delete window.strongKey2;"},
+ ];
+
+ function remoteObjectJSONFilter(key, value)
+ {
+ if (key === "objectId")
+ return "<filtered>";
+
+ return value;
+ }
+
+ function runNextStep() {
+ if (currentStepIndex >= steps.length) {
+ InspectorTest.completeTest();
+ return;
+ }
+
+ var step = steps[currentStepIndex++];
+ step.expression += " weakMap";
+
+ InspectorTest.log("");
+ InspectorTest.log("-----------------------------------------------------");
+ InspectorTest.log("EXPRESSION: " + step.expression);
+
+ // Run the expression, and then run a garbage collection on a different
+ // event loop so no objects are kept alive by the stack.
+ WebInspector.runtimeManager.evaluateInInspectedWindow(step.expression, "test", false, true, false, true, function(remoteObject, wasThrown) {
+ WebInspector.runtimeManager.evaluateInInspectedWindow("GCController.collect()", "test", false, true, false, false, function() {
+ InspectorTest.assert(remoteObject instanceof WebInspector.RemoteObject);
+ remoteObject.getCollectionEntries(0, 100, function(entries) {
+ InspectorTest.log("ENTRIES:");
+ entries.sort(function(a, b) { return a.value.value - b.value.value; });
+ InspectorTest.log(JSON.stringify(entries, remoteObjectJSONFilter, " "));
+ remoteObject.releaseWeakCollectionEntries();
+ runNextStep();
+ });
+ });
+ });
+ }
+
+ runNextStep();
+}
+</script>
+</head>
+<body onload="runTest();">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/LayoutTests/inspector/model/remote-object.html 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> {expression: "[1, 2]"},
</span><span class="cx"> {expression: "[[1],[2],[3]]"},
</span><span class="cx"> {expression: "[true, 1, 1.234, 'string', /regex/]"},
</span><ins>+ {expression: "[{a:1}, {b:2}, {c:2}]"},
+ {expression: "[[{a:1}, {b:2}, {c:2}]]"},
</ins><span class="cx"> {expression: "arr = []; arr.length = 100; arr"}, // 100 empty elements
</span><span class="cx"> {expression: "arr = []; arr.length = 100; arr.fill(1)"}, // 100 full elements
</span><span class="cx"> {expression: "arr = []; arr.length = 100; arr[10] = 1; arr"}, // sparse
</span><span class="lines">@@ -117,7 +119,7 @@
</span><span class="cx"> {expression: "map = new Map; map.set(1, 2); map.set('key', 'value'); map"},
</span><span class="cx"> {expression: "map = new Map; map.set({a:1}, {b:2}); map.set(document.body, [1,2]); map"},
</span><span class="cx"> {expression: "map = new Map; for (var i = 0; i <= 100; i++) map.set(i, i); map"},
</span><del>- {expression: "map = new WeakMap; map.set({id:1}, [1,2]); map"},
</del><ins>+ {expression: "map = new WeakMap; strongKey = {id:1}; map.set(strongKey, [1,2]); map"},
</ins><span class="cx">
</span><span class="cx"> // Set
</span><span class="cx"> {expression: "new Set"},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -1,3 +1,75 @@
</span><ins>+2015-01-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ES6: Improved Console Format for Set and Map Objects (like Arrays)
+ https://bugs.webkit.org/show_bug.cgi?id=122867
+
+ Reviewed by Timothy Hatcher.
+
+ Add new Runtime.RemoteObject object subtypes for "map", "set", and "weakmap".
+
+ Upgrade Runtime.ObjectPreview to include type/subtype information. Now,
+ an ObjectPreview can be used for any value, in place of a RemoteObject,
+ and not capture / hold a reference to the value. The value will be in
+ the string description.
+
+ Adding this information to ObjectPreview can duplicate some information
+ in the protocol messages if a preview is provided, but simplifies
+ previews, so that all the information you need for any RemoteObject
+ preview is available. To slim messages further, make "overflow" and
+ "properties" only available on previews that may contain properties.
+ So, not primitives or null.
+
+ Finally, for "Map/Set/WeakMap" add an "entries" list to the preview
+ that will return previews with "key" and "value" properties depending
+ on the collection type. To get live, non-preview objects from a
+ collection, use Runtime.getCollectionEntries.
+
+ In order to keep the WeakMap's values Weak the frontend may provide
+ a unique object group name when getting collection entries. It may
+ then release that object group, e.g. when not showing the WeakMap's
+ values to the user, and thus remove the strong reference to the keys
+ so they may be garbage collected.
+
+ * runtime/WeakMapData.h:
+ (JSC::WeakMapData::begin):
+ (JSC::WeakMapData::end):
+ Expose iterators so the Inspector may access WeakMap keys/values.
+
+ * inspector/JSInjectedScriptHostPrototype.cpp:
+ (Inspector::JSInjectedScriptHostPrototype::finishCreation):
+ (Inspector::jsInjectedScriptHostPrototypeFunctionWeakMapEntries):
+ * inspector/JSInjectedScriptHost.h:
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::subtype):
+ Discern "map", "set", and "weakmap" object subtypes.
+
+ (Inspector::JSInjectedScriptHost::weakMapEntries):
+ Return a list of WeakMap entries. These are strong references
+ that the Inspector code is responsible for releasing.
+
+ * inspector/protocol/Runtime.json:
+ Update types and expose the new getCollectionEntries command.
+
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::getCollectionEntries):
+ * inspector/InjectedScript.h:
+ * inspector/InjectedScript.cpp:
+ (Inspector::InjectedScript::getInternalProperties):
+ (Inspector::InjectedScript::getCollectionEntries):
+ Pass through to the InjectedScript and call getCollectionEntries.
+
+ * inspector/scripts/codegen/generator.py:
+ Add another type with runtime casting.
+
+ * inspector/InjectedScriptSource.js:
+ - Implement getCollectionEntries to get a range of values from a
+ collection. The non-Weak collections have an order to their keys (in
+ order of added) so range'd gets are okay. WeakMap does not have an
+ order, so only allow fetching a number of values.
+ - Update preview generation to address the Runtime.ObjectPreview
+ type changes.
+
</ins><span class="cx"> 2015-01-28 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -137,10 +137,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(WTF::move(result));
</span><del>- if (array->length() > 0)
- *properties = array;
</del><ins>+ *properties = array->length() > 0 ? array : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void InjectedScript::getCollectionEntries(ErrorString& errorString, const String& objectId, const String& objectGroup, int startIndex, int numberToFetch, RefPtr<Protocol::Array<Protocol::Runtime::CollectionEntry>>* entries)
+{
+ Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getCollectionEntries"), inspectorEnvironment()->functionCallHandler());
+ function.appendArgument(objectId);
+ function.appendArgument(objectGroup);
+ function.appendArgument(startIndex);
+ function.appendArgument(numberToFetch);
+
+ RefPtr<InspectorValue> result;
+ makeCall(function, &result);
+ if (!result || result->type() != InspectorValue::Type::Array) {
+ errorString = ASCIILiteral("Internal error");
+ return;
+ }
+
+ *entries = BindingTraits<Array<Protocol::Runtime::CollectionEntry>>::runtimeCast(WTF::move(result));
+}
+
</ins><span class="cx"> Ref<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.h (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Protocol::Debugger::FunctionDetails>* result);
</span><span class="cx"> void getProperties(ErrorString&, const String& objectId, bool ownProperties, bool ownAndGetterProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
</span><span class="cx"> void getInternalProperties(ErrorString&, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
</span><ins>+ void getCollectionEntries(ErrorString&, const String& objectId, const String& objectGroup, int startIndex, int numberToFetch, RefPtr<Protocol::Array<Protocol::Runtime::CollectionEntry>>* entries);
</ins><span class="cx">
</span><span class="cx"> Ref<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
</span><span class="cx"> RefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> {
</span><span class="cx"> return "" + obj;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function isUInt32(obj)
</span><span class="cx"> {
</span><span class="cx"> if (typeof obj === "number")
</span><span class="lines">@@ -231,6 +231,27 @@
</span><span class="cx"> return descriptors;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ getCollectionEntries: function(objectId, objectGroupName, startIndex, numberToFetch)
+ {
+ var parsedObjectId = this._parseObjectId(objectId);
+ var object = this._objectForId(parsedObjectId);
+ var objectGroupName = objectGroupName || this._idToObjectGroupName[parsedObjectId.id];
+ if (!this._isDefined(object))
+ return;
+
+ if (typeof object !== "object")
+ return;
+
+ var entries = this._getCollectionEntries(object, InjectedScriptHost.subtype(object), startIndex, numberToFetch);
+
+ return entries.map(function(entry) {
+ entry.value = injectedScript._wrapObject(entry.value, objectGroupName, false, true);
+ if ("key" in entry)
+ entry.key = injectedScript._wrapObject(entry.key, objectGroupName, false, true);
+ return entry;
+ });
+ },
+
</ins><span class="cx"> getFunctionDetails: function(functionId)
</span><span class="cx"> {
</span><span class="cx"> var parsedFunctionId = this._parseObjectId(functionId);
</span><span class="lines">@@ -579,7 +600,7 @@
</span><span class="cx"> if (ownProperties)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Include __proto__ at the end.
</span><span class="cx"> try {
</span><span class="cx"> if (object.__proto__)
</span><span class="lines">@@ -677,6 +698,61 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return className;
</span><ins>+ },
+
+ _getSetEntries: function(object, skip, numberToFetch)
+ {
+ var entries = [];
+
+ for (var value of object) {
+ if (skip > 0) {
+ skip--;
+ continue;
+ }
+
+ entries.push({value: value});
+
+ if (numberToFetch && entries.length === numberToFetch)
+ break;
+ }
+
+ return entries;
+ },
+
+ _getMapEntries: function(object, skip, numberToFetch)
+ {
+ var entries = [];
+
+ for (var [key, value] of object) {
+ if (skip > 0) {
+ skip--;
+ continue;
+ }
+
+ entries.push({key: key, value: value});
+
+ if (numberToFetch && entries.length === numberToFetch)
+ break;
+ }
+
+ return entries;
+ },
+
+ _getWeakMapEntries: function(object, numberToFetch)
+ {
+ return InjectedScriptHost.weakMapEntries(object, numberToFetch);
+ },
+
+ _getCollectionEntries: function(object, subtype, startIndex, numberToFetch)
+ {
+ if (subtype === "set")
+ return this._getSetEntries(object, startIndex, numberToFetch);
+ if (subtype === "map")
+ return this._getMapEntries(object, startIndex, numberToFetch);
+ if (subtype === "weakmap")
+ return this._getWeakMapEntries(object, numberToFetch);
+
+ throw "unexpected type";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -695,7 +771,7 @@
</span><span class="cx"> if (this.type !== "undefined")
</span><span class="cx"> this.value = object;
</span><span class="cx">
</span><del>- // Null object is object with 'null' subtype'
</del><ins>+ // Null object is object with 'null' subtype.
</ins><span class="cx"> if (object === null)
</span><span class="cx"> this.subtype = "null";
</span><span class="cx">
</span><span class="lines">@@ -706,6 +782,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.objectId = injectedScript._bind(object, objectGroupName);
</span><ins>+
</ins><span class="cx"> var subtype = injectedScript._subtype(object);
</span><span class="cx"> if (subtype)
</span><span class="cx"> this.subtype = subtype;
</span><span class="lines">@@ -718,13 +795,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript.RemoteObject.prototype = {
</span><ins>+ _emptyPreview: function()
+ {
+ var preview = {
+ type: this.type,
+ description: this.description || toString(this.value),
+ lossless: true,
+ };
+
+ if (this.subtype) {
+ preview.subtype = this.subtype;
+ if (this.subtype !== "null") {
+ preview.overflow = false;
+ preview.properties = [];
+ }
+ }
+
+ return preview;
+ },
+
+ _createObjectPreviewForValue: function(value)
+ {
+ var remoteObject = new InjectedScript.RemoteObject(value, undefined, false, true, undefined);
+ if (remoteObject.objectId)
+ injectedScript.releaseObject(remoteObject.objectId);
+
+ return remoteObject.preview || remoteObject._emptyPreview();
+ },
+
</ins><span class="cx"> _generatePreview: function(object, firstLevelKeys, secondLevelKeys)
</span><span class="cx"> {
</span><del>- var preview = {};
- preview.lossless = true;
- preview.overflow = false;
- preview.properties = [];
</del><ins>+ var preview = this._emptyPreview();
</ins><span class="cx">
</span><ins>+ // Primitives just have a value.
+ if (this.type !== "object")
+ return;
+
</ins><span class="cx"> var isTableRowsRequest = secondLevelKeys === null || secondLevelKeys;
</span><span class="cx"> var firstLevelKeysCount = firstLevelKeys ? firstLevelKeys.length : 0;
</span><span class="cx">
</span><span class="lines">@@ -734,14 +840,19 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- // All properties.
</del><ins>+ // Maps and Sets have entries.
+ if (this.subtype === "map" || this.subtype === "set" || this.subtype === "weakmap")
+ this._appendEntryPreviews(object, preview);
+
+ // Properties.
+ preview.properties = [];
</ins><span class="cx"> var descriptors = injectedScript._propertyDescriptors(object);
</span><del>- this._appendPropertyDescriptors(preview, descriptors, propertiesThreshold, secondLevelKeys);
</del><ins>+ this._appendPropertyPreviews(preview, descriptors, propertiesThreshold, secondLevelKeys);
</ins><span class="cx"> if (propertiesThreshold.indexes < 0 || propertiesThreshold.properties < 0)
</span><span class="cx"> return preview;
</span><span class="cx">
</span><span class="cx"> // FIXME: Internal properties.
</span><del>- // FIXME: Map/Set/Iterator entries.
</del><ins>+ // FIXME: Iterator entries.
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> preview.lossless = false;
</span><span class="cx"> }
</span><span class="lines">@@ -749,7 +860,7 @@
</span><span class="cx"> return preview;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _appendPropertyDescriptors: function(preview, descriptors, propertiesThreshold, secondLevelKeys)
</del><ins>+ _appendPropertyPreviews: function(preview, descriptors, propertiesThreshold, secondLevelKeys)
</ins><span class="cx"> {
</span><span class="cx"> for (var descriptor of descriptors) {
</span><span class="cx"> // Seen enough.
</span><span class="lines">@@ -851,6 +962,27 @@
</span><span class="cx"> preview.properties.push(property);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _appendEntryPreviews: function(object, preview)
+ {
+ // Fetch 6, but only return 5, so we can tell if we overflowed.
+ var entries = injectedScript._getCollectionEntries(object, this.subtype, 0, 6);
+ if (!entries)
+ return;
+
+ if (entries.length > 5) {
+ entries.pop();
+ preview.overflow = true;
+ preview.lossless = false;
+ }
+
+ preview.entries = entries.map(function(entry) {
+ entry.value = this._createObjectPreviewForValue(entry.value);
+ if ("key" in entry)
+ entry.key = this._createObjectPreviewForValue(entry.key);
+ return entry;
+ }, this);
+ },
+
</ins><span class="cx"> _abbreviateString: function(string, maxLength, middle)
</span><span class="cx"> {
</span><span class="cx"> if (string.length <= maxLength)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -30,14 +30,18 @@
</span><span class="cx"> #include "Error.h"
</span><span class="cx"> #include "InjectedScriptHost.h"
</span><span class="cx"> #include "JSArray.h"
</span><ins>+#include "JSCInlines.h"
</ins><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSInjectedScriptHostPrototype.h"
</span><ins>+#include "JSMap.h"
+#include "JSSet.h"
</ins><span class="cx"> #include "JSTypedArrays.h"
</span><ins>+#include "JSWeakMap.h"
</ins><span class="cx"> #include "ObjectConstructor.h"
</span><del>-#include "JSCInlines.h"
</del><span class="cx"> #include "RegExpObject.h"
</span><span class="cx"> #include "SourceCode.h"
</span><span class="cx"> #include "TypedArrayInlines.h"
</span><ins>+#include "WeakMapData.h"
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -129,6 +133,14 @@
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("date"));
</span><span class="cx"> if (value.inherits(RegExpObject::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("regexp"));
</span><ins>+
+ if (value.inherits(JSMap::info()))
+ return jsNontrivialString(exec, ASCIILiteral("map"));
+ if (value.inherits(JSSet::info()))
+ return jsNontrivialString(exec, ASCIILiteral("set"));
+ if (value.inherits(JSWeakMap::info()))
+ return jsNontrivialString(exec, ASCIILiteral("weakmap"));
+
</ins><span class="cx"> if (value.inherits(JSInt8Array::info()) || value.inherits(JSInt16Array::info()) || value.inherits(JSInt32Array::info()))
</span><span class="cx"> return jsNontrivialString(exec, ASCIILiteral("array"));
</span><span class="cx"> if (value.inherits(JSUint8Array::info()) || value.inherits(JSUint16Array::info()) || value.inherits(JSUint32Array::info()))
</span><span class="lines">@@ -185,6 +197,37 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue JSInjectedScriptHost::weakMapEntries(ExecState* exec)
+{
+ if (exec->argumentCount() < 1)
+ return jsUndefined();
+
+ JSValue value = exec->uncheckedArgument(0);
+ JSWeakMap* weakMap = jsDynamicCast<JSWeakMap*>(value);
+ if (!weakMap)
+ return jsUndefined();
+
+ unsigned fetched = 0;
+ unsigned numberToFetch = 100;
+
+ JSValue numberToFetchArg = exec->argument(1);
+ double fetchDouble = numberToFetchArg.toInteger(exec);
+ if (fetchDouble >= 0)
+ numberToFetch = static_cast<unsigned>(fetchDouble);
+
+ JSArray* array = constructEmptyArray(exec, nullptr);
+ for (auto it = weakMap->weakMapData()->begin(); it != weakMap->weakMapData()->end(); ++it) {
+ JSObject* entry = constructEmptyObject(exec);
+ entry->putDirect(exec->vm(), Identifier(exec, "key"), it->key);
+ entry->putDirect(exec->vm(), Identifier(exec, "value"), it->value.get());
+ array->putDirectIndex(exec, fetched++, entry);
+ if (numberToFetch && fetched >= numberToFetch)
+ break;
+ }
+
+ return array;
+}
+
</ins><span class="cx"> JSValue toJS(ExecState* exec, JSGlobalObject* globalObject, InjectedScriptHost* impl)
</span><span class="cx"> {
</span><span class="cx"> if (!impl)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> JSC::JSValue subtype(JSC::ExecState*);
</span><span class="cx"> JSC::JSValue functionDetails(JSC::ExecState*);
</span><span class="cx"> JSC::JSValue getInternalProperties(JSC::ExecState*);
</span><ins>+ JSC::JSValue weakMapEntries(JSC::ExecState*);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHostPrototype.cpp 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionGetInternalProperties(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionInternalConstructorName(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection(ExecState*);
</span><ins>+static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionWeakMapEntries(ExecState*);
</ins><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeAttributeEvaluate(ExecState*);
</span><span class="cx">
</span><span class="lines">@@ -59,6 +60,7 @@
</span><span class="cx"> JSC_NATIVE_FUNCTION("getInternalProperties", jsInjectedScriptHostPrototypeFunctionGetInternalProperties, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION("internalConstructorName", jsInjectedScriptHostPrototypeFunctionInternalConstructorName, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION("isHTMLAllCollection", jsInjectedScriptHostPrototypeFunctionIsHTMLAllCollection, DontEnum, 1);
</span><ins>+ JSC_NATIVE_FUNCTION("weakMapEntries", jsInjectedScriptHostPrototypeFunctionWeakMapEntries, DontEnum, 1);
</ins><span class="cx">
</span><span class="cx"> Identifier evaluateIdentifier(&vm, "evaluate");
</span><span class="cx"> GetterSetter* accessor = GetterSetter::create(vm, globalObject);
</span><span class="lines">@@ -100,6 +102,17 @@
</span><span class="cx"> return JSValue::encode(castedThis->isHTMLAllCollection(exec));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionWeakMapEntries(ExecState* exec)
+{
+ JSValue thisValue = exec->thisValue();
+ JSInjectedScriptHost* castedThis = jsDynamicCast<JSInjectedScriptHost*>(thisValue);
+ if (!castedThis)
+ return throwVMTypeError(exec);
+
+ ASSERT_GC_OBJECT_INHERITS(castedThis, JSInjectedScriptHost::info());
+ return JSValue::encode(castedThis->weakMapEntries(exec));
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL jsInjectedScriptHostPrototypeFunctionSubtype(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -178,6 +178,20 @@
</span><span class="cx"> setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorRuntimeAgent::getCollectionEntries(ErrorString& errorString, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries)
+{
+ InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+ if (injectedScript.hasNoValue()) {
+ errorString = ASCIILiteral("Inspected frame has gone");
+ return;
+ }
+
+ int start = startIndex && *startIndex >= 0 ? *startIndex : 0;
+ int fetch = numberToFetch && *numberToFetch >= 0 ? *numberToFetch : 0;
+
+ injectedScript.getCollectionEntries(errorString, objectId, objectGroup ? *objectGroup : String(), start, fetch, &entries);
+}
+
</ins><span class="cx"> void InspectorRuntimeAgent::releaseObject(ErrorString&, const String& objectId)
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> virtual void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>&& optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
</span><span class="cx"> virtual void releaseObject(ErrorString&, const ErrorString& objectId) override final;
</span><span class="cx"> virtual void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* ownAndGetterProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
</span><ins>+ virtual void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) override final;
</ins><span class="cx"> virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
</span><span class="cx"> virtual void run(ErrorString&) override;
</span><span class="cx"> virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const RefPtr<Inspector::InspectorArray>&& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolRuntimejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> "description": "Mirror object referencing original JavaScript object.",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean"], "description": "Object type." },
</span><del>- { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
</del><ins>+ { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "error", "map", "set", "weakmap"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
</ins><span class="cx"> { "name": "className", "type": "string", "optional": true, "description": "Object class (constructor) name. Specified for <code>object</code> type values only." },
</span><span class="cx"> { "name": "value", "type": "any", "optional": true, "description": "Remote object value (in case of primitive values or JSON values if it was requested)." },
</span><span class="cx"> { "name": "description", "type": "string", "optional": true, "description": "String representation of the object." },
</span><span class="lines">@@ -26,9 +26,13 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "description": "Object containing abbreviated remote object value.",
</span><span class="cx"> "properties": [
</span><ins>+ { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean"], "description": "Object type." },
+ { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "error", "map", "set", "weakmap"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
+ { "name": "description", "type": "string", "optional": true, "description": "String representation of the object." },
</ins><span class="cx"> { "name": "lossless", "type": "boolean", "description": "Determines whether preview is lossless (contains all information of the original object)." },
</span><del>- { "name": "overflow", "type": "boolean", "description": "True iff some of the properties of the original did not fit." },
- { "name": "properties", "type": "array", "items": { "$ref": "PropertyPreview" }, "description": "List of the properties." }
</del><ins>+ { "name": "overflow", "type": "boolean", "optional": true, "description": "True iff some of the properties of the original did not fit." },
+ { "name": "properties", "type": "array", "items": { "$ref": "PropertyPreview" }, "optional": true, "description": "List of the properties." },
+ { "name": "entries", "type": "array", "items": { "$ref": "EntryPreview" }, "optional": true, "description": "List of the entries. Specified for <code>map</code> and <code>set</code> subtype values only." }
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -37,12 +41,28 @@
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "name", "type": "string", "description": "Property name." },
</span><span class="cx"> { "name": "type", "type": "string", "enum": ["object", "function", "undefined", "string", "number", "boolean", "accessor"], "description": "Object type." },
</span><del>- { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "error"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
</del><ins>+ { "name": "subtype", "type": "string", "optional": true, "enum": ["array", "null", "node", "regexp", "date", "error", "map", "set", "weakmap"], "description": "Object subtype hint. Specified for <code>object</code> type values only." },
</ins><span class="cx"> { "name": "value", "type": "string", "optional": true, "description": "User-friendly property value string." },
</span><span class="cx"> { "name": "valuePreview", "$ref": "ObjectPreview", "optional": true, "description": "Nested value preview." }
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "id": "EntryPreview",
+ "type": "object",
+ "properties": [
+ { "name": "key", "$ref": "ObjectPreview", "optional": true, "description": "Entry key. Specified for map-like collection entries." },
+ { "name": "value", "$ref": "ObjectPreview", "description": "Entry value." }
+ ]
+ },
+ {
+ "id": "CollectionEntry",
+ "type": "object",
+ "properties": [
+ { "name": "key", "$ref": "Runtime.RemoteObject", "optional": true, "description": "Entry key of a map-like collection, otherwise not provided." },
+ { "name": "value", "$ref": "Runtime.RemoteObject", "description": "Entry value." }
+ ]
+ },
+ {
</ins><span class="cx"> "id": "PropertyDescriptor",
</span><span class="cx"> "type": "object",
</span><span class="cx"> "description": "Object property descriptor.",
</span><span class="lines">@@ -225,6 +245,19 @@
</span><span class="cx"> "description": "Returns properties of a given object. Object group of the result is inherited from the target object."
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "name": "getCollectionEntries",
+ "description": "Returns entries of given Map / Set collection.",
+ "parameters": [
+ { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "description": "Id of the collection to get entries for." },
+ { "name": "objectGroup", "optional": true, "type": "string", "description": "Symbolic group name that can be used to release multiple. If not provided, it will be the same objectGroup as the RemoteObject determined from <code>objectId</code>. This is useful for WeakMap to release the collection entries." },
+ { "name": "startIndex", "optional": true, "type": "integer", "description": "If provided skip to this index before collecting values. Otherwise, 0." },
+ { "name": "numberToFetch", "optional": true, "type": "integer", "description": "If provided only return <code>numberToFetch</code> values. Otherwise, return values all the way to the end." }
+ ],
+ "returns": [
+ { "name": "entries", "type": "array", "items": { "$ref": "CollectionEntry" }, "description": "Array of collection entries." }
+ ]
+ },
+ {
</ins><span class="cx"> "name": "releaseObject",
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "objectId", "$ref": "RemoteObjectId", "description": "Identifier of the object to release." }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> "Runtime.RemoteObject",
</span><span class="cx"> "Runtime.PropertyDescriptor",
</span><span class="cx"> "Runtime.InternalPropertyDescriptor",
</span><ins>+ "Runtime.CollectionEntry",
</ins><span class="cx"> "Debugger.FunctionDetails",
</span><span class="cx"> "Debugger.CallFrame",
</span><span class="cx"> "Canvas.TraceLog",
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapData.h (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapData.h 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapData.h 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx">
</span><span class="cx"> static const unsigned StructureFlags = StructureIsImmortal | Base::StructureFlags;
</span><span class="cx">
</span><ins>+ typedef HashMap<JSObject*, WriteBarrier<Unknown>> MapType;
+ MapType::const_iterator begin() const { return m_map.begin(); }
+ MapType::const_iterator end() const { return m_map.end(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> WeakMapData(VM&);
</span><span class="cx"> static void destroy(JSCell*);
</span><span class="lines">@@ -82,7 +86,6 @@
</span><span class="cx"> WeakMapData* m_target;
</span><span class="cx"> };
</span><span class="cx"> DeadKeyCleaner m_deadKeyCleaner;
</span><del>- typedef HashMap<JSObject*, WriteBarrier<Unknown>> MapType;
</del><span class="cx"> MapType m_map;
</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 (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2015-01-29 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: ES6: Improved Console Format for Set and Map Objects (like Arrays)
+ https://bugs.webkit.org/show_bug.cgi?id=122867
+
+ Reviewed by Timothy Hatcher.
+
+ This includes Set/Map/WeakMap previews:
+
+ - Set previews: Set {1, 2, 3}
+ - Map/WeakMap previews: Map {1 => 2, "key" => "value"}
+
+ For WeakMaps:
+
+ - the preview itself shows up to 5 key/value pairs from when the object was logged
+ - the previews are strings only, and thus do not retain the actual keys/values
+ - when expanding, we get RemoteObjects and strongly retain the keys/values
+ - when collapsing / clearing, we release the RemoteObjects so they can get collected
+
+ Currently you collapse the <entries> section, and re-expand later the
+ collection may show you knew keys/values. The UI for this will change.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Protocol/RemoteObject.js:
+ (WebInspector.RemoteObject.prototype.isCollectionType):
+ (WebInspector.RemoteObject.prototype.isWeakCollection):
+ (WebInspector.RemoteObject.prototype.getCollectionEntries):
+ (WebInspector.RemoteObject.prototype.releaseWeakCollectionEntries):
+ (WebInspector.RemoteObject.prototype.arrayLength):
+ (WebInspector.RemoteObject.prototype._weakCollectionObjectGroup):
+ High level functions for dealing with a RemoteObject that may be a
+ collection / weak collection.
+
+ * UserInterface/Views/ConsoleMessageImpl.js:
+ (WebInspector.ConsoleMessageImpl):
+ (WebInspector.ConsoleMessageImpl.prototype._formatParameterAsObject):
+ Include default formatters for collection types.
+
+ (WebInspector.ConsoleMessageImpl.prototype._appendPreview):
+ (WebInspector.ConsoleMessageImpl.prototype._appendEntryPreviews):
+ (WebInspector.ConsoleMessageImpl.prototype._appendPropertyPreviews):
+ (WebInspector.ConsoleMessageImpl.prototype._appendValuePreview):
+ (WebInspector.ConsoleMessageImpl.prototype._appendObjectPreview): Deleted.
+ Refactor preview generation a bit and include a specific path for
+ generation the output of a preview with "entries".
+
+ * UserInterface/Views/LogContentView.css:
+ (.console-object-preview-body .console-object-preview-name.console-object-preview-name-Object):
+ With nested Object previews ("Map {{a:1} => 1}") don't show "Object" for the inner
+ object preview. Only show it if it has a unique type ("Map {Foo {a:1} => 1}")
+
+ (.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap):
+ (:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .section):
+ (:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .properties):
+ Make map/set/weakmap display like Objects.
+
+ * UserInterface/Views/ObjectPropertiesSection.js:
+ (WebInspector.ObjectPropertiesSection.prototype.update):
+ (WebInspector.ObjectPropertiesSection.prototype.updateProperties):
+ (WebInspector.ObjectPropertyTreeElement.prototype.onpopulate.callback):
+ (WebInspector.ObjectPropertyTreeElement.prototype.onpopulate):
+ (WebInspector.CollectionEntriesMainTreeElement):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype.onexpand.callback):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype.onexpand):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype.oncollapse):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype.ondetach):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype._trackWeakEntries):
+ (WebInspector.CollectionEntriesMainTreeElement.prototype._untrackWeakEntries):
+ (WebInspector.CollectionEntryTreeElement):
+ (WebInspector.CollectionEntryTreeElement.prototype.onpopulate):
+ (WebInspector.CollectionEntryTreeElement.prototype.onattach):
+ (WebInspector.EmptyCollectionTreeElement):
+ (WebInspector.ObjectPropertiesSection.prototype.update.callback): Deleted.
+ Add a quick UI for exploring the entries of a collection. We are actively
+ changing the styles of objects in the Console, so this should change soon.
+
</ins><span class="cx"> 2015-01-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Change Main Frame Status Buttons when debugging Augmented JSContext
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> localizedStrings["Element is masked and composited descendants"] = "Element is masked and composited descendants";
</span><span class="cx"> localizedStrings["Element is the root element"] = "Element is the root element";
</span><span class="cx"> localizedStrings["Element overlaps other compositing element"] = "Element overlaps other compositing element";
</span><ins>+localizedStrings["Empty Collection"] = "Empty Collection";
</ins><span class="cx"> localizedStrings["Enable Breakpoint"] = "Enable Breakpoint";
</span><span class="cx"> localizedStrings["Enable Breakpoints"] = "Enable Breakpoints";
</span><span class="cx"> localizedStrings["Enable all breakpoints"] = "Enable all breakpoints";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -223,6 +223,42 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ isCollectionType: function()
+ {
+ return this.subtype === "map" || this.subtype === "set" || this.subtype === "weakmap";
+ },
+
+ isWeakCollection: function()
+ {
+ return this.subtype === "weakmap";
+ },
+
+ getCollectionEntries: function(start, numberToFetch, callback)
+ {
+ start = typeof start === "number" ? start : 0;
+ numberToFetch = typeof numberToFetch === "number" ? numberToFetch : 100;
+
+ console.assert(start >= 0);
+ console.assert(numberToFetch >= 0);
+ console.assert(this.isCollectionType());
+
+ // WeakMaps are not ordered. We should never send a non-zero start.
+ console.assert((this.subtype === "weakmap" && start === 0) || this.subtype !== "weakmap");
+
+ var objectGroup = this.isWeakCollection() ? this._weakCollectionObjectGroup() : "";
+
+ RuntimeAgent.getCollectionEntries(this._objectId, objectGroup, start, numberToFetch, function(error, entries) {
+ callback(entries);
+ });
+ },
+
+ releaseWeakCollectionEntries: function()
+ {
+ console.assert(this.isWeakCollection());
+
+ RuntimeAgent.releaseObjectGroup(this._weakCollectionObjectGroup());
+ },
+
</ins><span class="cx"> pushNodeToFrontend: function(callback)
</span><span class="cx"> {
</span><span class="cx"> if (this._objectId)
</span><span class="lines">@@ -265,6 +301,13 @@
</span><span class="cx"> if (!matches)
</span><span class="cx"> return 0;
</span><span class="cx"> return parseInt(matches[1], 10);
</span><ins>+ },
+
+ // Private
+
+ _weakCollectionObjectGroup: function()
+ {
+ return JSON.stringify(this._objectId) + "-WeakMap";
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageImpljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> this._customFormatters = {
</span><span class="cx"> "object": this._formatParameterAsObject,
</span><span class="cx"> "error": this._formatParameterAsObject,
</span><ins>+ "map": this._formatParameterAsObject,
+ "set": this._formatParameterAsObject,
+ "weakmap": this._formatParameterAsObject,
</ins><span class="cx"> "array": this._formatParameterAsArray,
</span><span class="cx"> "node": this._formatParameterAsNode,
</span><span class="cx"> "string": this._formatParameterAsString
</span><span class="lines">@@ -276,7 +279,17 @@
</span><span class="cx"> var titleElement = document.createElement("span");
</span><span class="cx"> if (includePreview && obj.preview) {
</span><span class="cx"> titleElement.classList.add("console-object-preview");
</span><del>- var lossless = this._appendObjectPreview(titleElement, obj);
</del><ins>+
+ // COMPATIBILITY (iOS 8): iOS 7 and 8 did not have type/subtype/description on
+ // Runtime.ObjectPreview. Copy them over from the RemoteObject.
+ var preview = obj.preview;
+ if (!preview.type) {
+ preview.type = obj.type;
+ preview.subtype = obj.subtype;
+ preview.description = obj.description;
+ }
+
+ var lossless = this._appendPreview(titleElement, preview);
</ins><span class="cx"> if (lossless) {
</span><span class="cx"> titleElement.classList.add("console-object-preview-lossless");
</span><span class="cx"> elem.appendChild(titleElement);
</span><span class="lines">@@ -289,23 +302,58 @@
</span><span class="cx"> elem.appendChild(section.element);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _appendObjectPreview: function(titleElement, obj)
</del><ins>+ _appendPreview: function(element, preview)
</ins><span class="cx"> {
</span><del>- var preview = obj.preview;
- var isArray = obj.subtype === "array";
-
- if (obj.description && !isArray) {
</del><ins>+ if (preview.type === "object" && preview.subtype !== "null" && preview.subtype !== "array") {
</ins><span class="cx"> var previewObjectNameElement = document.createElement("span");
</span><span class="cx"> previewObjectNameElement.classList.add("console-object-preview-name");
</span><del>- if (obj.description === "Object")
</del><ins>+ if (preview.description === "Object")
</ins><span class="cx"> previewObjectNameElement.classList.add("console-object-preview-name-Object");
</span><span class="cx">
</span><del>- previewObjectNameElement.textContent = obj.description + " ";
- titleElement.appendChild(previewObjectNameElement);
</del><ins>+ previewObjectNameElement.textContent = preview.description + " ";
+ element.appendChild(previewObjectNameElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var bodyElement = titleElement.createChild("span", "console-object-preview-body");
- bodyElement.appendChild(document.createTextNode(isArray ? "[" : "{"));
</del><ins>+ var bodyElement = element.createChild("span", "console-object-preview-body");
+ if (preview.entries)
+ return this._appendEntryPreviews(bodyElement, preview);
+ if (preview.properties)
+ return this._appendPropertyPreviews(bodyElement, preview);
+ return this._appendValuePreview(bodyElement, preview);
+ },
+
+ _appendEntryPreviews: function(element, preview)
+ {
+ var lossless = preview.lossless && !preview.properties.length;
+
+ element.appendChild(document.createTextNode("{"));
+
+ for (var i = 0; i < preview.entries.length; ++i) {
+ if (i > 0)
+ element.appendChild(document.createTextNode(", "));
+
+ var entry = preview.entries[i];
+ if (entry.key) {
+ this._appendPreview(element, entry.key);
+ element.appendChild(document.createTextNode(" => "));
+ }
+
+ this._appendPreview(element, entry.value);
+ }
+
+ if (preview.overflow)
+ element.createChild("span").textContent = "\u2026";
+ element.appendChild(document.createTextNode("}"));
+
+ return lossless;
+ },
+
+ _appendPropertyPreviews: function(element, preview)
+ {
+ var isArray = preview.subtype === "array";
+
+ element.appendChild(document.createTextNode(isArray ? "[" : "{"));
+
</ins><span class="cx"> for (var i = 0; i < preview.properties.length; ++i) {
</span><span class="cx"> var property = preview.properties[i];
</span><span class="cx">
</span><span class="lines">@@ -318,14 +366,14 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (i > 0)
</span><del>- bodyElement.appendChild(document.createTextNode(", "));
</del><ins>+ element.appendChild(document.createTextNode(", "));
</ins><span class="cx">
</span><span class="cx"> if (!isArray || property.name != i) {
</span><del>- bodyElement.createChild("span", "name").textContent = property.name;
- bodyElement.appendChild(document.createTextNode(": "));
</del><ins>+ element.createChild("span", "name").textContent = property.name;
+ element.appendChild(document.createTextNode(": "));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var span = bodyElement.createChild("span", "console-formatted-" + property.type);
</del><ins>+ var span = element.createChild("span", "console-formatted-" + property.type);
</ins><span class="cx"> if (property.type === "object") {
</span><span class="cx"> if (property.subtype === "node")
</span><span class="cx"> span.classList.add("console-formatted-preview-node");
</span><span class="lines">@@ -340,12 +388,20 @@
</span><span class="cx"> else
</span><span class="cx"> span.textContent = property.value;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (preview.overflow)
</span><del>- bodyElement.createChild("span").textContent = "\u2026";
- bodyElement.appendChild(document.createTextNode(isArray ? "]" : "}"));
</del><ins>+ element.createChild("span").textContent = "\u2026";
+
+ element.appendChild(document.createTextNode(isArray ? "]" : "}"));
+
</ins><span class="cx"> return preview.lossless;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _appendValuePreview: function(element, preview)
+ {
+ element.appendChild(document.createTextNode(preview.description));
+ },
+
</ins><span class="cx"> _formatParameterAsNode: function(object, elem)
</span><span class="cx"> {
</span><span class="cx"> function printNode(nodeId)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -290,22 +290,26 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.console-object-preview-body .console-object-preview-name.console-object-preview-name-Object {
+ display: none;
+}
+
</ins><span class="cx"> .expanded .console-object-preview > .console-object-preview-name.console-object-preview-name-Object {
</span><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-formatted-object, .console-formatted-node, .console-formatted-error {
</del><ins>+.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap {
</ins><span class="cx"> position: relative;
</span><span class="cx"> display: inline-block;
</span><span class="cx"> vertical-align: top;
</span><span class="cx"> color: black;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-formatted-object .section, .console-formatted-node .section, .console-formatted-error .section {
</del><ins>+:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .section {
</ins><span class="cx"> position: static;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-formatted-object .properties, .console-formatted-node .properties, .console-formatted-error .properties {
</del><ins>+:matches(.console-formatted-object, .console-formatted-node, .console-formatted-error, .console-formatted-map, .console-formatted-set, .console-formatted-weakmap) .properties {
</ins><span class="cx"> padding-left: 0 !important;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectPropertiesSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js (179348 => 179349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js 2015-01-29 19:20:06 UTC (rev 179348)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesSection.js 2015-01-29 19:25:16 UTC (rev 179349)
</span><span class="lines">@@ -43,17 +43,18 @@
</span><span class="cx">
</span><span class="cx"> update: function()
</span><span class="cx"> {
</span><del>- var self = this;
</del><span class="cx"> function callback(properties)
</span><span class="cx"> {
</span><span class="cx"> if (!properties)
</span><span class="cx"> return;
</span><del>- self.updateProperties(properties);
</del><ins>+
+ this.updateProperties(properties);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (this.getAllProperties)
</span><del>- this.object.getAllProperties(callback);
</del><ins>+ this.object.getAllProperties(callback.bind(this));
</ins><span class="cx"> else
</span><del>- this.object.getOwnAndGetterProperties(callback);
</del><ins>+ this.object.getOwnAndGetterProperties(callback.bind(this));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateProperties: function(properties, rootTreeElementConstructor, rootPropertyComparer)
</span><span class="lines">@@ -86,6 +87,9 @@
</span><span class="cx"> }
</span><span class="cx"> this.propertiesForTest = properties;
</span><span class="cx">
</span><ins>+ if (this.object.isCollectionType())
+ this.propertiesTreeOutline.appendChild(new WebInspector.CollectionEntriesMainTreeElement(this.object));
+
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.Section.Event.VisibleContentDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -153,15 +157,17 @@
</span><span class="cx"> if (this.children.length && !this.shouldRefreshChildren)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var callback = function(properties) {
</del><ins>+ function callback(properties) {
</ins><span class="cx"> this.removeChildren();
</span><span class="cx"> if (!properties)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> properties.sort(WebInspector.ObjectPropertiesSection.CompareProperties);
</span><del>- for (var i = 0; i < properties.length; ++i) {
</del><ins>+ for (var i = 0; i < properties.length; ++i)
</ins><span class="cx"> this.appendChild(new this.treeOutline.section.treeElementConstructor(properties[i]));
</span><del>- }
</del><ins>+
+ if (this.property.value.isCollectionType())
+ this.appendChild(new WebInspector.CollectionEntriesMainTreeElement(this.property.value));
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if (this.property.name === "__proto__")
</span><span class="lines">@@ -345,3 +351,188 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.ObjectPropertyTreeElement.prototype.__proto__ = TreeElement.prototype;
</span><ins>+
+WebInspector.CollectionEntriesMainTreeElement = function(remoteObject)
+{
+ TreeElement.call(this, "<entries>", null, false);
+
+ console.assert(remoteObject);
+
+ this._remoteObject = remoteObject;
+ this._requestingEntries = false;
+ this._trackingEntries = false;
+
+ this.toggleOnClick = true;
+ this.selectable = false;
+ this.hasChildren = true;
+ this.expand();
+
+ // FIXME: When a parent TreeElement is collapsed, we do not get a chance
+ // to releaseWeakCollectionEntries. We should.
+}
+
+WebInspector.CollectionEntriesMainTreeElement.prototype = {
+ constructor: WebInspector.CollectionEntriesMainTreeElement,
+ __proto__: TreeElement.prototype,
+
+ onexpand: function()
+ {
+ if (this.children.length && !this.shouldRefreshChildren)
+ return;
+
+ if (this._requestingEntries)
+ return;
+
+ this._requestingEntries = true;
+
+ function callback(entries) {
+ this._requestingEntries = false;
+
+ this.removeChildren();
+
+ if (!entries || !entries.length) {
+ this.appendChild(new WebInspector.EmptyCollectionTreeElement);
+ return;
+ }
+
+ this._trackWeakEntries();
+
+ for (var i = 0; i < entries.length; ++i) {
+ var entry = entries[i];
+ if (entry.key)
+ this.appendChild(new WebInspector.CollectionEntryTreeElement(entry, i));
+ else {
+ this.appendChild(new WebInspector.ObjectPropertyTreeElement({
+ name: "" + i,
+ value: WebInspector.RemoteObject.fromPayload(entry.value),
+ enumerable: true,
+ writable: false,
+ }));
+ }
+ }
+ }
+
+ this._remoteObject.getCollectionEntries(0, 100, callback.bind(this));
+ },
+
+ oncollapse: function()
+ {
+ this._untrackWeakEntries();
+ },
+
+ ondetach: function()
+ {
+ this._untrackWeakEntries();
+ },
+
+ // Private.
+
+ _trackWeakEntries: function()
+ {
+ if (!this._remoteObject.isWeakCollection())
+ return;
+
+ if (this._trackingEntries)
+ return;
+
+ this._trackingEntries = true;
+
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._untrackWeakEntries, this);
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._untrackWeakEntries, this);
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.SessionStarted, this._untrackWeakEntries, this);
+ },
+
+ _untrackWeakEntries: function()
+ {
+ if (!this._remoteObject.isWeakCollection())
+ return;
+
+ if (!this._trackingEntries)
+ return;
+
+ this._trackingEntries = false;
+
+ this._remoteObject.releaseWeakCollectionEntries();
+
+ WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.Cleared, this._untrackWeakEntries, this);
+ WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.ActiveLogCleared, this._untrackWeakEntries, this);
+ WebInspector.logManager.removeEventListener(WebInspector.LogManager.Event.SessionStarted, this._untrackWeakEntries, this);
+
+ this.removeChildren();
+
+ if (this.expanded)
+ this.collapse();
+ },
+}
+
+WebInspector.CollectionEntryTreeElement = function(entry, index)
+{
+ TreeElement.call(this, "", null, false);
+
+ console.assert(entry);
+
+ this._name = "" + index;
+ this._key = WebInspector.RemoteObject.fromPayload(entry.key);
+ this._value = WebInspector.RemoteObject.fromPayload(entry.value);
+
+ this.toggleOnClick = true;
+ this.selectable = false;
+ this.hasChildren = true;
+}
+
+WebInspector.CollectionEntryTreeElement.prototype = {
+ constructor: WebInspector.CollectionEntryTreeElement,
+ __proto__: TreeElement.prototype,
+
+ onpopulate: function()
+ {
+ if (this.children.length && !this.shouldRefreshChildren)
+ return;
+
+ this.appendChild(new WebInspector.ObjectPropertyTreeElement({
+ name: "key",
+ value: this._key,
+ enumerable: true,
+ writable: false,
+ }));
+
+ this.appendChild(new WebInspector.ObjectPropertyTreeElement({
+ name: "value",
+ value: this._value,
+ enumerable: true,
+ writable: false,
+ }));
+ },
+
+ onattach: function()
+ {
+ var nameElement = document.createElement("span");
+ nameElement.className = "name";
+ nameElement.textContent = "" + this._name;
+
+ var separatorElement = document.createElement("span");
+ separatorElement.className = "separator";
+ separatorElement.textContent = ": ";
+
+ var valueElement = document.createElement("span");
+ valueElement.className = "value";
+ valueElement.textContent = "{" + this._key.description + " => " + this._value.description + "}";
+
+ this.listItemElement.removeChildren();
+ this.listItemElement.appendChild(nameElement);
+ this.listItemElement.appendChild(separatorElement);
+ this.listItemElement.appendChild(valueElement);
+ }
+}
+
+WebInspector.EmptyCollectionTreeElement = function()
+{
+ TreeElement.call(this, WebInspector.UIString("Empty Collection"), null, false);
+
+ this.selectable = false;
+}
+
+WebInspector.EmptyCollectionTreeElement.prototype = {
+ constructor: WebInspector.EmptyCollectionTreeElement,
+ __proto__: TreeElement.prototype
+}
</ins></span></pre>
</div>
</div>
</body>
</html>