<!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>[179659] 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/179659">179659</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-04 19:11:29 -0800 (Wed, 04 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: ES6: Improved Console Support for Symbol Objects
https://bugs.webkit.org/show_bug.cgi?id=141173

Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

* inspector/protocol/Runtime.json:
New type, &quot;symbol&quot;.

* inspector/InjectedScriptSource.js:
Handle Symbol objects in a few places. They don't have properties
and they cannot be implicitly converted to strings.

Source/WebInspectorUI:

* UserInterface/Protocol/RemoteObject.js:
(WebInspector.RemoteObject):
(WebInspector.RemoteObject.prototype._isSymbol):
Symbols have an objectId because it is a non-primitive that cannot be passed
by value, however it cannot have properties, so handle some cases.

* UserInterface/Views/LogContentView.css:
(.console-formatted-symbol):
Give Symbol's their own color.

LayoutTests:

* inspector/model/remote-object-expected.txt:
* inspector/model/remote-object.html:
Update the RemoteObject test to include Symbols.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolRuntimejson">trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/LayoutTests/ChangeLog        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: ES6: Improved Console Support for Symbol Objects
+        https://bugs.webkit.org/show_bug.cgi?id=141173
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/model/remote-object-expected.txt:
+        * inspector/model/remote-object.html:
+        Update the RemoteObject test to include Symbols.
+
</ins><span class="cx"> 2015-02-04  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         http/tests/misc/detached-frame-console.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -16,6 +16,24 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: Symbol()
+{
+  &quot;_type&quot;: &quot;symbol&quot;,
+  &quot;_subtype&quot;: &quot;symbol&quot;,
+  &quot;_objectId&quot;: &quot;&lt;filtered&gt;&quot;,
+  &quot;_description&quot;: &quot;Symbol()&quot;
+}
+
+-----------------------------------------------------
+EXPRESSION: Symbol('test')
+{
+  &quot;_type&quot;: &quot;symbol&quot;,
+  &quot;_subtype&quot;: &quot;symbol&quot;,
+  &quot;_objectId&quot;: &quot;&lt;filtered&gt;&quot;,
+  &quot;_description&quot;: &quot;Symbol(test)&quot;
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: true
</span><span class="cx"> {
</span><span class="cx">   &quot;_type&quot;: &quot;boolean&quot;,
</span><span class="lines">@@ -1396,7 +1414,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> -----------------------------------------------------
</span><del>-EXPRESSION: ({a: 1, b: &quot;string&quot;, c :/regex/})
</del><ins>+EXPRESSION: ({a: 1, b: &quot;string&quot;, c: /regex/, d: Symbol('sym')})
</ins><span class="cx"> {
</span><span class="cx">   &quot;_type&quot;: &quot;object&quot;,
</span><span class="cx">   &quot;_objectId&quot;: &quot;&lt;filtered&gt;&quot;,
</span><span class="lines">@@ -1421,6 +1439,11 @@
</span><span class="cx">         &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">         &quot;subtype&quot;: &quot;regexp&quot;,
</span><span class="cx">         &quot;value&quot;: &quot;/regex/&quot;
</span><ins>+      },
+      {
+        &quot;name&quot;: &quot;d&quot;,
+        &quot;type&quot;: &quot;symbol&quot;,
+        &quot;value&quot;: &quot;Symbol(sym)&quot;
</ins><span class="cx">       }
</span><span class="cx">     ]
</span><span class="cx">   }
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/LayoutTests/inspector/model/remote-object.html        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -14,6 +14,10 @@
</span><span class="cx">         {expression: &quot;null&quot;},
</span><span class="cx">         {expression: &quot;undefined&quot;},
</span><span class="cx"> 
</span><ins>+        // Symbol
+        {expression: &quot;Symbol()&quot;},
+        {expression: &quot;Symbol('test')&quot;},
+
</ins><span class="cx">     // Primatives:
</span><span class="cx"> 
</span><span class="cx">         // Boolean
</span><span class="lines">@@ -83,7 +87,7 @@
</span><span class="cx">         // Object
</span><span class="cx">         {expression: &quot;({})&quot;},
</span><span class="cx">         {expression: &quot;({a: 1})&quot;},
</span><del>-        {expression: &quot;({a: 1, b: \&quot;string\&quot;, c :/regex/})&quot;},
</del><ins>+        {expression: &quot;({a: 1, b: \&quot;string\&quot;, c: /regex/, d: Symbol('sym')})&quot;},
</ins><span class="cx">         {expression: &quot;({a:function a(){}, b:function b(){}, get getter(){}, set setter(v){}})&quot;},
</span><span class="cx">         {expression: &quot;function Foo() {}; new Foo&quot;},
</span><span class="cx">         {expression: &quot;function Bar() { this._x = 5 }; Bar.prototype = {constructor: Bar, get x() {return this._x;}}; new Bar&quot;},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: ES6: Improved Console Support for Symbol Objects
+        https://bugs.webkit.org/show_bug.cgi?id=141173
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/protocol/Runtime.json:
+        New type, &quot;symbol&quot;.
+
+        * inspector/InjectedScriptSource.js:
+        Handle Symbol objects in a few places. They don't have properties
+        and they cannot be implicitly converted to strings.
+
</ins><span class="cx"> 2015-02-04  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Undo gardening: Restoring the expected ERROR message since that is not the cause of the bot unhappiness.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> function toString(obj)
</span><span class="cx"> {
</span><del>-    return &quot;&quot; + obj;
</del><ins>+    return String(obj);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function isUInt32(obj)
</span><span class="lines">@@ -46,6 +46,11 @@
</span><span class="cx">     return &quot;&quot; + (obj &gt;&gt;&gt; 0) === obj;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+function isSymbol(obj)
+{
+    return typeof obj === &quot;symbol&quot;;
+}
+
</ins><span class="cx"> var InjectedScript = function()
</span><span class="cx"> {
</span><span class="cx">     this._lastBoundObjectId = 1;
</span><span class="lines">@@ -59,7 +64,7 @@
</span><span class="cx">     undefined: true,
</span><span class="cx">     boolean: true,
</span><span class="cx">     number: true,
</span><del>-    string: true
</del><ins>+    string: true,
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> InjectedScript.CollectionMode = {
</span><span class="lines">@@ -200,6 +205,9 @@
</span><span class="cx">         if (!this._isDefined(object))
</span><span class="cx">             return false;
</span><span class="cx"> 
</span><ins>+        if (isSymbol(object))
+            return false;
+
</ins><span class="cx">         var collectionMode = InjectedScript.CollectionMode.AllProperties;
</span><span class="cx">         if (ownProperties)
</span><span class="cx">             collectionMode = InjectedScript.CollectionMode.OwnProperties;
</span><span class="lines">@@ -231,9 +239,13 @@
</span><span class="cx">         var parsedObjectId = this._parseObjectId(objectId);
</span><span class="cx">         var object = this._objectForId(parsedObjectId);
</span><span class="cx">         var objectGroupName = this._idToObjectGroupName[parsedObjectId.id];
</span><ins>+
</ins><span class="cx">         if (!this._isDefined(object))
</span><span class="cx">             return false;
</span><span class="cx"> 
</span><ins>+        if (isSymbol(object))
+            return false;
+
</ins><span class="cx">         var descriptors = [];
</span><span class="cx">         var internalProperties = InjectedScriptHost.getInternalProperties(object);
</span><span class="cx">         if (internalProperties) {
</span><span class="lines">@@ -669,6 +681,9 @@
</span><span class="cx">         if (this.isPrimitiveValue(obj))
</span><span class="cx">             return null;
</span><span class="cx"> 
</span><ins>+        if (isSymbol(obj))
+            return toString(obj);
+
</ins><span class="cx">         var subtype = this._subtype(obj);
</span><span class="cx"> 
</span><span class="cx">         if (subtype === &quot;regexp&quot;)
</span><span class="lines">@@ -940,6 +955,17 @@
</span><span class="cx">                 continue;
</span><span class="cx">             }
</span><span class="cx"> 
</span><ins>+            // Symbol.
+            if (isSymbol(value)) {
+                var symbolString = toString(value);
+                if (symbolString.length &gt; maxLength) {
+                    symbolString = this._abbreviateString(symbolString, maxLength, true);
+                    preview.lossless = false;
+                }
+                this._appendPropertyPreview(preview, {name: name, type: type, value: symbolString}, propertiesThreshold);
+                return;
+            }
+
</ins><span class="cx">             // Object.
</span><span class="cx">             var property = {name: name, type: type};
</span><span class="cx">             var subtype = injectedScript._subtype(value);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolRuntimejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">             &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">             &quot;description&quot;: &quot;Mirror object referencing original JavaScript object.&quot;,
</span><span class="cx">             &quot;properties&quot;: [
</span><del>-                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</del><ins>+                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;, &quot;symbol&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</ins><span class="cx">                 { &quot;name&quot;: &quot;subtype&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;enum&quot;: [&quot;array&quot;, &quot;null&quot;, &quot;node&quot;, &quot;regexp&quot;, &quot;date&quot;, &quot;error&quot;, &quot;map&quot;, &quot;set&quot;, &quot;weakmap&quot;], &quot;description&quot;: &quot;Object subtype hint. Specified for &lt;code&gt;object&lt;/code&gt; type values only.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;className&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Object class (constructor) name. Specified for &lt;code&gt;object&lt;/code&gt; type values only.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;value&quot;, &quot;type&quot;: &quot;any&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Remote object value (in case of primitive values or JSON values if it was requested).&quot; },
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">             &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">             &quot;description&quot;: &quot;Object containing abbreviated remote object value.&quot;,
</span><span class="cx">             &quot;properties&quot;: [
</span><del>-                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</del><ins>+                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;, &quot;symbol&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</ins><span class="cx">                 { &quot;name&quot;: &quot;subtype&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;enum&quot;: [&quot;array&quot;, &quot;null&quot;, &quot;node&quot;, &quot;regexp&quot;, &quot;date&quot;, &quot;error&quot;, &quot;map&quot;, &quot;set&quot;, &quot;weakmap&quot;], &quot;description&quot;: &quot;Object subtype hint. Specified for &lt;code&gt;object&lt;/code&gt; type values only.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;description&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;String representation of the object.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;lossless&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;Determines whether preview is lossless (contains all information of the original object).&quot; },
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">             &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">             &quot;properties&quot;: [
</span><span class="cx">                 { &quot;name&quot;: &quot;name&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;Property name.&quot; },
</span><del>-                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;, &quot;accessor&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</del><ins>+                { &quot;name&quot;: &quot;type&quot;, &quot;type&quot;: &quot;string&quot;, &quot;enum&quot;: [&quot;object&quot;, &quot;function&quot;, &quot;undefined&quot;, &quot;string&quot;, &quot;number&quot;, &quot;boolean&quot;, &quot;symbol&quot;, &quot;accessor&quot;], &quot;description&quot;: &quot;Object type.&quot; },
</ins><span class="cx">                 { &quot;name&quot;: &quot;subtype&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;enum&quot;: [&quot;array&quot;, &quot;null&quot;, &quot;node&quot;, &quot;regexp&quot;, &quot;date&quot;, &quot;error&quot;, &quot;map&quot;, &quot;set&quot;, &quot;weakmap&quot;], &quot;description&quot;: &quot;Object subtype hint. Specified for &lt;code&gt;object&lt;/code&gt; type values only.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;value&quot;, &quot;type&quot;: &quot;string&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;User-friendly property value string.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;valuePreview&quot;, &quot;$ref&quot;: &quot;ObjectPreview&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Nested value preview.&quot; }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-04  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: ES6: Improved Console Support for Symbol Objects
+        https://bugs.webkit.org/show_bug.cgi?id=141173
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Protocol/RemoteObject.js:
+        (WebInspector.RemoteObject):
+        (WebInspector.RemoteObject.prototype._isSymbol):
+        Symbols have an objectId because it is a non-primitive that cannot be passed
+        by value, however it cannot have properties, so handle some cases.
+
+        * UserInterface/Views/LogContentView.css:
+        (.console-formatted-symbol):
+        Give Symbol's their own color.
+
</ins><span class="cx"> 2015-02-04  Nikita Vasilyev  &lt;nvasilyev@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Insertion bar (caret) is hidden behind the placeholder text in the style editor
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolRemoteObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/RemoteObject.js        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">         // handle
</span><span class="cx">         this._objectId = objectId;
</span><span class="cx">         this._description = description;
</span><del>-        this._hasChildren = true;
</del><ins>+        this._hasChildren = type !== &quot;symbol&quot;;
</ins><span class="cx">         this._preview = preview;
</span><span class="cx">     } else {
</span><span class="cx">         // Primitive or null object.
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> 
</span><span class="cx">     _getProperties: function(ownProperties, ownAndGetterProperties, callback)
</span><span class="cx">     {
</span><del>-        if (!this._objectId) {
</del><ins>+        if (!this._objectId || this._isSymbol()) {
</ins><span class="cx">             callback([]);
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> 
</span><span class="cx">     setPropertyValue: function(name, value, callback)
</span><span class="cx">     {
</span><del>-        if (!this._objectId) {
</del><ins>+        if (!this._objectId || this._isSymbol()) {
</ins><span class="cx">             callback(&quot;Can't set a property of non-object.&quot;);
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="lines">@@ -223,6 +223,11 @@
</span><span class="cx">         }
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    _isSymbol: function()
+    {
+        return this.type === &quot;symbol&quot;;
+    },
+
</ins><span class="cx">     isCollectionType: function()
</span><span class="cx">     {
</span><span class="cx">         return this.subtype === &quot;map&quot; || this.subtype === &quot;set&quot; || this.subtype === &quot;weakmap&quot;;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css (179658 => 179659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css        2015-02-05 02:36:22 UTC (rev 179658)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css        2015-02-05 03:11:29 UTC (rev 179659)
</span><span class="lines">@@ -337,6 +337,10 @@
</span><span class="cx">     color: rgb(255, 88, 0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+.console-formatted-symbol {
+    color: rgb(63, 169, 156);
+}
+
</ins><span class="cx"> .console-formatted-null, .console-formatted-undefined {
</span><span class="cx">     color: rgb(128, 128, 128);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>