<!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>[180173] 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/180173">180173</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-16 14:10:12 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Scope details sidebar should label objects with constructor names
https://bugs.webkit.org/show_bug.cgi?id=139449
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-16
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::internalConstructorName):
* runtime/Structure.cpp:
(JSC::Structure::toStructureShape):
Share calculatedClassName.
* runtime/JSObject.h:
* runtime/JSObject.cpp:
(JSC::JSObject::calculatedClassName):
Elaborate on a way to get an Object's class name.
LayoutTests:
* inspector/model/remote-object-expected.txt:
* inspector/model/remote-object.html:
Improve the test to include Objects where previously
we would have had poorer class name descriptions.</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="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/LayoutTests/ChangeLog 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Scope details sidebar should label objects with constructor names
+ https://bugs.webkit.org/show_bug.cgi?id=139449
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/model/remote-object-expected.txt:
+ * inspector/model/remote-object.html:
+ Improve the test to include Objects where previously
+ we would have had poorer class name descriptions.
+
</ins><span class="cx"> 2015-02-16 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Update expected result for editing/pasteboard/5761530-1.html after r177774
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object-expected.txt (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/LayoutTests/inspector/model/remote-object-expected.txt 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -1495,6 +1495,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: var Foo2 = function() {}; new Foo2
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "Foo2",
+ "_preview": {
+ "type": "object",
+ "description": "Foo2",
+ "lossless": true,
+ "properties": []
+ }
+}
+
+-----------------------------------------------------
+EXPRESSION: var namespace = {}; namespace.Foo3 = function() {}; new namespace.Foo3
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "Foo3",
+ "_preview": {
+ "type": "object",
+ "description": "Foo3",
+ "lossless": true,
+ "properties": []
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: function Bar() { this._x = 5 }; Bar.prototype = {constructor: Bar, get x() {return this._x;}}; new Bar
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span><span class="lines">@@ -1524,6 +1552,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -----------------------------------------------------
</span><ins>+EXPRESSION: function Bar2() { this._x = 5 }; Bar.prototype = {get x() {return this._x;}}; new Bar2
+{
+ "_type": "object",
+ "_objectId": "<filtered>",
+ "_description": "Bar2",
+ "_preview": {
+ "type": "object",
+ "description": "Bar2",
+ "lossless": true,
+ "properties": [
+ {
+ "name": "_x",
+ "type": "number",
+ "value": "5"
+ }
+ ]
+ }
+}
+
+-----------------------------------------------------
</ins><span class="cx"> EXPRESSION: window.loadEvent
</span><span class="cx"> {
</span><span class="cx"> "_type": "object",
</span></span></pre></div>
<a id="trunkLayoutTestsinspectormodelremoteobjecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/model/remote-object.html (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/model/remote-object.html 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/LayoutTests/inspector/model/remote-object.html 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -90,7 +90,10 @@
</span><span class="cx"> {expression: "({a: 1, b: \"string\", c: /regex/, d: Symbol('sym')})"},
</span><span class="cx"> {expression: "({a:function a(){}, b:function b(){}, get getter(){}, set setter(v){}})"},
</span><span class="cx"> {expression: "function Foo() {}; new Foo"},
</span><ins>+ {expression: "var Foo2 = function() {}; new Foo2"},
+ {expression: "var namespace = {}; namespace.Foo3 = function() {}; new namespace.Foo3"},
</ins><span class="cx"> {expression: "function Bar() { this._x = 5 }; Bar.prototype = {constructor: Bar, get x() {return this._x;}}; new Bar"},
</span><ins>+ {expression: "function Bar2() { this._x = 5 }; Bar.prototype = {get x() {return this._x;}}; new Bar2"},
</ins><span class="cx"> {expression: "window.loadEvent"}, // window.loadEvent is set inside of <body onload="..."> below.
</span><span class="cx"> {expression: "new ArrayBuffer(16)"},
</span><span class="cx"> {expression: "new DataView(new ArrayBuffer(16))"},
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Scope details sidebar should label objects with constructor names
+ https://bugs.webkit.org/show_bug.cgi?id=139449
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::internalConstructorName):
+ * runtime/Structure.cpp:
+ (JSC::Structure::toStructureShape):
+ Share calculatedClassName.
+
+ * runtime/JSObject.h:
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::calculatedClassName):
+ Elaborate on a way to get an Object's class name.
+
</ins><span class="cx"> 2015-02-16 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG SSA should use GetLocal for arguments, and the GetArgument node type should be removed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -96,9 +96,8 @@
</span><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>- JSObject* thisObject = jsCast<JSObject*>(exec->uncheckedArgument(0).toThis(exec, NotStrictMode));
- String result = thisObject->methodTable()->className(thisObject);
- return jsString(exec, result);
</del><ins>+ JSObject* object = jsCast<JSObject*>(exec->uncheckedArgument(0).toThis(exec, NotStrictMode));
+ return jsString(exec, JSObject::calculatedClassName(object));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSInjectedScriptHost::isHTMLAllCollection(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -257,6 +257,44 @@
</span><span class="cx"> return info->className;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String JSObject::calculatedClassName(JSObject* object)
+{
+ String prototypeFunctionName;
+ ExecState* exec = object->globalObject()->globalExec();
+ PropertySlot slot(object->structure()->storedPrototype());
+ PropertyName constructor(exec->propertyNames().constructor);
+ if (object->getPropertySlot(exec, constructor, slot)) {
+ if (slot.isValue()) {
+ JSValue constructorValue = slot.getValue(exec, constructor);
+ if (constructorValue.isCell()) {
+ if (JSCell* constructorCell = constructorValue.asCell()) {
+ if (JSObject* ctorObject = constructorCell->getObject()) {
+ if (JSFunction* constructorFunction = jsDynamicCast<JSFunction*>(ctorObject))
+ prototypeFunctionName = constructorFunction->calculatedDisplayName(exec);
+ else if (InternalFunction* constructorFunction = jsDynamicCast<InternalFunction*>(ctorObject))
+ prototypeFunctionName = constructorFunction->calculatedDisplayName(exec);
+ }
+ }
+ }
+ }
+ }
+
+ if (prototypeFunctionName.isNull() || prototypeFunctionName == "Object") {
+ String tableClassName = object->methodTable()->className(object);
+ if (!tableClassName.isNull() && tableClassName != "Object")
+ return tableClassName;
+
+ String classInfoName = object->classInfo()->className;
+ if (!classInfoName.isNull())
+ return classInfoName;
+
+ if (prototypeFunctionName.isNull())
+ return ASCIILiteral("Object");
+ }
+
+ return prototypeFunctionName;
+}
+
</ins><span class="cx"> bool JSObject::getOwnPropertySlotByIndex(JSObject* thisObject, ExecState* exec, unsigned i, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> // NB. The fact that we're directly consulting our indexed storage implies that it is not
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE static void copyBackingStore(JSCell*, CopyVisitor&, CopyToken);
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static String className(const JSObject*);
</span><ins>+ JS_EXPORT_PRIVATE static String calculatedClassName(JSObject*);
</ins><span class="cx">
</span><span class="cx"> JSValue prototype() const;
</span><span class="cx"> JS_EXPORT_PRIVATE void setPrototype(VM&, JSValue prototype);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (180172 => 180173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2015-02-16 21:58:33 UTC (rev 180172)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2015-02-16 22:10:12 UTC (rev 180173)
</span><span class="lines">@@ -1059,32 +1059,10 @@
</span><span class="cx"> curShape->addProperty(structure->m_nameInPrevious.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool foundCtorName = false;
- if (JSObject* profilingVal = curValue.getObject()) {
- ExecState* exec = profilingVal->globalObject()->globalExec();
- PropertySlot slot(storedPrototype());
- PropertyName constructor(exec->propertyNames().constructor);
- if (profilingVal->getPropertySlot(exec, constructor, slot)) {
- if (slot.isValue()) {
- JSValue constructorValue = slot.getValue(exec, constructor);
- if (constructorValue.isCell()) {
- if (JSCell* constructorCell = constructorValue.asCell()) {
- if (JSObject* ctorObject = constructorCell->getObject()) {
- if (JSFunction* constructorFunction = jsDynamicCast<JSFunction*>(ctorObject)) {
- curShape->setConstructorName(constructorFunction->calculatedDisplayName(exec));
- foundCtorName = true;
- } else if (InternalFunction* constructorFunction = jsDynamicCast<InternalFunction*>(ctorObject)) {
- curShape->setConstructorName(constructorFunction->calculatedDisplayName(exec));
- foundCtorName = true;
- }
- }
- }
- }
- }
- }
- }
-
- if (!foundCtorName)
</del><ins>+
+ if (JSObject* curObject = curValue.getObject())
+ curShape->setConstructorName(JSObject::calculatedClassName(curObject));
+ else
</ins><span class="cx"> curShape->setConstructorName(curStructure->classInfo()->className);
</span><span class="cx">
</span><span class="cx"> if (curStructure->isDictionary())
</span></span></pre>
</div>
</div>
</body>
</html>