<!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>[178796] trunk/Source/JavaScriptCore</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/178796">178796</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-20 20:22:24 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Clean up InjectedScriptSource.js
https://bugs.webkit.org/show_bug.cgi?id=140709
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-01-20
Reviewed by Timothy Hatcher.
This patch includes some relevant Blink patches and small changes.
Patch by <aandrey@chromium.org>
DevTools: Remove console last result $_ on console clear.
https://src.chromium.org/viewvc/blink?revision=179179&view=revision
Patch by <eustas@chromium.org>
[Inspect DOM properties] incorrect CSS Selector Syntax
https://src.chromium.org/viewvc/blink?revision=156903&view=revision
* inspector/InjectedScriptSource.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178795 => 178796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-21 02:44:32 UTC (rev 178795)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-21 04:22:24 UTC (rev 178796)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Clean up InjectedScriptSource.js
+ https://bugs.webkit.org/show_bug.cgi?id=140709
+
+ Reviewed by Timothy Hatcher.
+
+ This patch includes some relevant Blink patches and small changes.
+
+ Patch by <aandrey@chromium.org>
+ DevTools: Remove console last result $_ on console clear.
+ https://src.chromium.org/viewvc/blink?revision=179179&view=revision
+
+ Patch by <eustas@chromium.org>
+ [Inspect DOM properties] incorrect CSS Selector Syntax
+ https://src.chromium.org/viewvc/blink?revision=156903&view=revision
+
+ * inspector/InjectedScriptSource.js:
+
+2015-01-20 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Cleanup RuntimeAgent a bit
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140706
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (178795 => 178796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-21 02:44:32 UTC (rev 178795)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-01-21 04:22:24 UTC (rev 178796)
</span><span class="lines">@@ -28,19 +28,11 @@
</span><span class="cx">
</span><span class="cx"> //# sourceURL=__WebInspectorInjectedScript__
</span><span class="cx">
</span><del>-/**
- * @param {InjectedScriptHost} InjectedScriptHost
- * @param {GlobalObject} inspectedGlobalObject
- * @param {number} injectedScriptId
- */
</del><span class="cx"> (function (InjectedScriptHost, inspectedGlobalObject, injectedScriptId) {
</span><span class="cx">
</span><span class="cx"> // Protect against Object overwritten by the user code.
</span><span class="cx"> var Object = {}.constructor;
</span><span class="cx">
</span><del>-/**
- * @constructor
- */
</del><span class="cx"> var InjectedScript = function()
</span><span class="cx"> {
</span><span class="cx"> this._lastBoundObjectId = 1;
</span><span class="lines">@@ -50,10 +42,6 @@
</span><span class="cx"> this._modules = {};
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * @type {Object.<string, boolean>}
- * @const
- */
</del><span class="cx"> InjectedScript.primitiveTypes = {
</span><span class="cx"> undefined: true,
</span><span class="cx"> boolean: true,
</span><span class="lines">@@ -62,23 +50,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript.prototype = {
</span><del>- /**
- * @param {*} object
- * @return {boolean}
- */
</del><span class="cx"> isPrimitiveValue: function(object)
</span><span class="cx"> {
</span><span class="cx"> // FIXME(33716): typeof document.all is always 'undefined'.
</span><span class="cx"> return InjectedScript.primitiveTypes[typeof object] && !this._isHTMLAllCollection(object);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- * @param {string} groupName
- * @param {boolean} canAccessInspectedGlobalObject
- * @param {boolean} generatePreview
- * @return {!RuntimeAgent.RemoteObject}
- */
</del><span class="cx"> wrapObject: function(object, groupName, canAccessInspectedGlobalObject, generatePreview)
</span><span class="cx"> {
</span><span class="cx"> if (canAccessInspectedGlobalObject)
</span><span class="lines">@@ -96,10 +73,6 @@
</span><span class="cx"> delete this._exceptionValue;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- * @return {!RuntimeAgent.RemoteObject}
- */
</del><span class="cx"> _fallbackWrapper: function(object)
</span><span class="cx"> {
</span><span class="cx"> var result = {};
</span><span class="lines">@@ -108,15 +81,9 @@
</span><span class="cx"> result.value = object;
</span><span class="cx"> else
</span><span class="cx"> result.description = this._toString(object);
</span><del>- return /** @type {!RuntimeAgent.RemoteObject} */ (result);
</del><ins>+ return result;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {boolean} canAccessInspectedGlobalObject
- * @param {Object} table
- * @param {Array.<string>|string|boolean} columns
- * @return {!RuntimeAgent.RemoteObject}
- */
</del><span class="cx"> wrapTable: function(canAccessInspectedGlobalObject, table, columns)
</span><span class="cx"> {
</span><span class="cx"> if (!canAccessInspectedGlobalObject)
</span><span class="lines">@@ -124,7 +91,7 @@
</span><span class="cx"> var columnNames = null;
</span><span class="cx"> if (typeof columns === "string")
</span><span class="cx"> columns = [columns];
</span><del>- if (InjectedScriptHost.type(columns) == "array") {
</del><ins>+ if (InjectedScriptHost.type(columns) === "array") {
</ins><span class="cx"> columnNames = [];
</span><span class="cx"> for (var i = 0; i < columns.length; ++i)
</span><span class="cx"> columnNames.push(String(columns[i]));
</span><span class="lines">@@ -132,25 +99,12 @@
</span><span class="cx"> return this._wrapObject(table, "console", false, true, columnNames);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- */
</del><span class="cx"> inspectObject: function(object)
</span><span class="cx"> {
</span><span class="cx"> if (this._commandLineAPIImpl)
</span><span class="cx"> this._commandLineAPIImpl.inspect(object);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * This method cannot throw.
- * @param {*} object
- * @param {string=} objectGroupName
- * @param {boolean=} forceValueType
- * @param {boolean=} generatePreview
- * @param {?Array.<string>=} columnNames
- * @return {!RuntimeAgent.RemoteObject}
- * @suppress {checkTypes}
- */
</del><span class="cx"> _wrapObject: function(object, objectGroupName, forceValueType, generatePreview, columnNames)
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="lines">@@ -165,11 +119,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- * @param {string=} objectGroupName
- * @return {string}
- */
</del><span class="cx"> _bind: function(object, objectGroupName)
</span><span class="cx"> {
</span><span class="cx"> var id = this._lastBoundObjectId++;
</span><span class="lines">@@ -187,20 +136,15 @@
</span><span class="cx"> return objectId;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectId
- * @return {Object}
- */
</del><span class="cx"> _parseObjectId: function(objectId)
</span><span class="cx"> {
</span><span class="cx"> return InjectedScriptHost.evaluate("(" + objectId + ")");
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectGroupName
- */
</del><span class="cx"> releaseObjectGroup: function(objectGroupName)
</span><span class="cx"> {
</span><ins>+ if (objectGroupName === "console")
+ delete this._lastResult;
</ins><span class="cx"> var group = this._objectGroups[objectGroupName];
</span><span class="cx"> if (!group)
</span><span class="cx"> return;
</span><span class="lines">@@ -209,11 +153,6 @@
</span><span class="cx"> delete this._objectGroups[objectGroupName];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} methodName
- * @param {string} args
- * @return {*}
- */
</del><span class="cx"> dispatch: function(methodName, args)
</span><span class="cx"> {
</span><span class="cx"> var argsArray = InjectedScriptHost.evaluate("(" + args + ")");
</span><span class="lines">@@ -255,10 +194,6 @@
</span><span class="cx"> return descriptors;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectId
- * @return {Array.<Object>|boolean}
- */
</del><span class="cx"> getInternalProperties: function(objectId, ownProperties)
</span><span class="cx"> {
</span><span class="cx"> var parsedObjectId = this._parseObjectId(objectId);
</span><span class="lines">@@ -266,6 +201,7 @@
</span><span class="cx"> var objectGroupName = this._idToObjectGroupName[parsedObjectId.id];
</span><span class="cx"> if (!this._isDefined(object))
</span><span class="cx"> return false;
</span><ins>+
</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">@@ -278,13 +214,10 @@
</span><span class="cx"> descriptors.push(descriptor);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return descriptors;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} functionId
- * @return {!DebuggerAgent.FunctionDetails|string}
- */
</del><span class="cx"> getFunctionDetails: function(functionId)
</span><span class="cx"> {
</span><span class="cx"> var parsedFunctionId = this._parseObjectId(functionId);
</span><span class="lines">@@ -306,43 +239,23 @@
</span><span class="cx"> return details;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectId
- */
</del><span class="cx"> releaseObject: function(objectId)
</span><span class="cx"> {
</span><span class="cx"> var parsedObjectId = this._parseObjectId(objectId);
</span><span class="cx"> this._releaseObject(parsedObjectId.id);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} id
- */
</del><span class="cx"> _releaseObject: function(id)
</span><span class="cx"> {
</span><span class="cx"> delete this._idToWrappedObject[id];
</span><span class="cx"> delete this._idToObjectGroupName[id];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} expression
- * @param {string} objectGroup
- * @param {boolean} injectCommandLineAPI
- * @param {boolean} returnByValue
- * @param {boolean} generatePreview
- * @return {*}
- */
</del><span class="cx"> evaluate: function(expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview)
</span><span class="cx"> {
</span><span class="cx"> return this._evaluateAndWrap(InjectedScriptHost.evaluate, InjectedScriptHost, expression, objectGroup, false, injectCommandLineAPI, returnByValue, generatePreview);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectId
- * @param {string} expression
- * @param {boolean} returnByValue
- * @return {Object|string}
- */
</del><span class="cx"> callFunctionOn: function(objectId, expression, args, returnByValue)
</span><span class="cx"> {
</span><span class="cx"> var parsedObjectId = this._parseObjectId(objectId);
</span><span class="lines">@@ -352,15 +265,13 @@
</span><span class="cx">
</span><span class="cx"> if (args) {
</span><span class="cx"> var resolvedArgs = [];
</span><del>- args = InjectedScriptHost.evaluate(args);
- for (var i = 0; i < args.length; ++i) {
- var resolvedCallArgument;
</del><ins>+ var callArgs = InjectedScriptHost.evaluate(args);
+ for (var i = 0; i < callArgs.length; ++i) {
</ins><span class="cx"> try {
</span><del>- resolvedCallArgument = this._resolveCallArgument(args[i]);
</del><ins>+ resolvedArgs[i] = this._resolveCallArgument(callArgs[i]);
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> return String(e);
</span><span class="cx"> }
</span><del>- resolvedArgs.push(resolvedCallArgument)
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -370,19 +281,15 @@
</span><span class="cx"> if (typeof func !== "function")
</span><span class="cx"> return "Given expression does not evaluate to a function";
</span><span class="cx">
</span><del>- return { wasThrown: false,
- result: this._wrapObject(func.apply(object, resolvedArgs), objectGroup, returnByValue) };
</del><ins>+ return {
+ wasThrown: false,
+ result: this._wrapObject(func.apply(object, resolvedArgs), objectGroup, returnByValue)
+ };
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> return this._createThrownValue(e, objectGroup);
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * Resolves a value from CallArgument description.
- * @param {RuntimeAgent.CallArgument} callArgumentJson
- * @return {*} resolved value
- * @throws {string} error message
- */
</del><span class="cx"> _resolveCallArgument: function(callArgumentJson) {
</span><span class="cx"> var objectId = callArgumentJson.objectId;
</span><span class="cx"> if (objectId) {
</span><span class="lines">@@ -397,54 +304,33 @@
</span><span class="cx"> return resolvedArg;
</span><span class="cx"> } else if ("value" in callArgumentJson)
</span><span class="cx"> return callArgumentJson.value;
</span><del>- else
- return undefined;
</del><ins>+ return undefined;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Function} evalFunction
- * @param {Object} object
- * @param {string} objectGroup
- * @param {boolean} isEvalOnCallFrame
- * @param {boolean} injectCommandLineAPI
- * @param {boolean} returnByValue
- * @param {boolean} generatePreview
- * @return {*}
- */
</del><span class="cx"> _evaluateAndWrap: function(evalFunction, object, expression, objectGroup, isEvalOnCallFrame, injectCommandLineAPI, returnByValue, generatePreview)
</span><span class="cx"> {
</span><span class="cx"> try {
</span><del>- return { wasThrown: false,
- result: this._wrapObject(this._evaluateOn(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup, returnByValue, generatePreview) };
</del><ins>+ return {
+ wasThrown: false,
+ result: this._wrapObject(this._evaluateOn(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI), objectGroup, returnByValue, generatePreview)
+ };
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> return this._createThrownValue(e, objectGroup);
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} value
- * @param {string} objectGroup
- * @return {Object}
- */
</del><span class="cx"> _createThrownValue: function(value, objectGroup)
</span><span class="cx"> {
</span><span class="cx"> var remoteObject = this._wrapObject(value, objectGroup);
</span><span class="cx"> try {
</span><span class="cx"> remoteObject.description = this._toString(value);
</span><span class="cx"> } catch (e) {}
</span><del>- return { wasThrown: true,
- result: remoteObject };
</del><ins>+ return {
+ wasThrown: true,
+ result: remoteObject
+ };
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Function} evalFunction
- * @param {Object} object
- * @param {string} objectGroup
- * @param {string} expression
- * @param {boolean} isEvalOnCallFrame
- * @param {boolean} injectCommandLineAPI
- * @return {*}
- */
</del><span class="cx"> _evaluateOn: function(evalFunction, object, objectGroup, expression, isEvalOnCallFrame, injectCommandLineAPI)
</span><span class="cx"> {
</span><span class="cx"> var commandLineAPI = null;
</span><span class="lines">@@ -524,10 +410,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} callFrame
- * @return {Array.<InjectedScript.CallFrameProxy>|boolean}
- */
</del><span class="cx"> wrapCallFrames: function(callFrame)
</span><span class="cx"> {
</span><span class="cx"> if (!callFrame)
</span><span class="lines">@@ -542,16 +424,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} topCallFrame
- * @param {string} callFrameId
- * @param {string} expression
- * @param {string} objectGroup
- * @param {boolean} injectCommandLineAPI
- * @param {boolean} returnByValue
- * @param {boolean} generatePreview
- * @return {*}
- */
</del><span class="cx"> evaluateOnCallFrame: function(topCallFrame, callFrameId, expression, objectGroup, injectCommandLineAPI, returnByValue, generatePreview)
</span><span class="cx"> {
</span><span class="cx"> var callFrame = this._callFrameForId(topCallFrame, callFrameId);
</span><span class="lines">@@ -560,11 +432,6 @@
</span><span class="cx"> return this._evaluateAndWrap(callFrame.evaluate, callFrame, expression, objectGroup, true, injectCommandLineAPI, returnByValue, generatePreview);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} topCallFrame
- * @param {string} callFrameId
- * @return {Object}
- */
</del><span class="cx"> _callFrameForId: function(topCallFrame, callFrameId)
</span><span class="cx"> {
</span><span class="cx"> var parsedCallFrameId = InjectedScriptHost.evaluate("(" + callFrameId + ")");
</span><span class="lines">@@ -575,48 +442,33 @@
</span><span class="cx"> return callFrame;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} objectId
- * @return {Object}
- */
</del><span class="cx"> _objectForId: function(objectId)
</span><span class="cx"> {
</span><span class="cx"> return this._idToWrappedObject[objectId.id];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} objectId
- * @return {Object}
- */
</del><span class="cx"> findObjectById: function(objectId)
</span><span class="cx"> {
</span><span class="cx"> var parsedObjectId = this._parseObjectId(objectId);
</span><span class="cx"> return this._objectForId(parsedObjectId);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} name
- * @return {Object}
- */
</del><span class="cx"> module: function(name)
</span><span class="cx"> {
</span><span class="cx"> return this._modules[name];
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} name
- * @param {string} source
- * @return {Object}
- */
</del><span class="cx"> injectModule: function(name, source, host)
</span><span class="cx"> {
</span><span class="cx"> delete this._modules[name];
</span><ins>+
</ins><span class="cx"> var moduleFunction = InjectedScriptHost.evaluate("(" + source + ")");
</span><span class="cx"> if (typeof moduleFunction !== "function") {
</span><span class="cx"> if (inspectedGlobalObject.console)
</span><span class="cx"> inspectedGlobalObject.console.error("Web Inspector error: A function was expected for module %s evaluation", name);
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> var module = moduleFunction.call(inspectedGlobalObject, InjectedScriptHost, inspectedGlobalObject, injectedScriptId, this, host);
</span><span class="cx"> this._modules[name] = module;
</span><span class="cx"> return module;
</span><span class="lines">@@ -725,29 +577,17 @@
</span><span class="cx"> return descriptors;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- * @return {boolean}
- */
</del><span class="cx"> _isDefined: function(object)
</span><span class="cx"> {
</span><span class="cx"> return !!object || this._isHTMLAllCollection(object);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} object
- * @return {boolean}
- */
</del><span class="cx"> _isHTMLAllCollection: function(object)
</span><span class="cx"> {
</span><span class="cx"> // document.all is reported as undefined, but we still want to process it.
</span><span class="cx"> return (typeof object === "undefined") && InjectedScriptHost.isHTMLAllCollection(object);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object=} obj
- * @return {string?}
- */
</del><span class="cx"> _subtype: function(obj)
</span><span class="cx"> {
</span><span class="cx"> if (obj === null)
</span><span class="lines">@@ -776,18 +616,11 @@
</span><span class="cx"> return null;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} obj
- * @return {string?}
- */
</del><span class="cx"> _describe: function(obj)
</span><span class="cx"> {
</span><span class="cx"> if (this.isPrimitiveValue(obj))
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- obj = /** @type {Object} */ (obj);
-
- // Type is object, get subtype.
</del><span class="cx"> var subtype = this._subtype(obj);
</span><span class="cx">
</span><span class="cx"> if (subtype === "regexp")
</span><span class="lines">@@ -805,7 +638,7 @@
</span><span class="cx"> case 1 /* Node.ELEMENT_NODE */:
</span><span class="cx"> description += obj.id ? "#" + obj.id : "";
</span><span class="cx"> var className = obj.className;
</span><del>- description += className ? "." + className : "";
</del><ins>+ description += (className && typeof className === "string") ? "." + className.trim().replace(/\s+/g, ".") : "";
</ins><span class="cx"> break;
</span><span class="cx"> case 10 /*Node.DOCUMENT_TYPE_NODE */:
</span><span class="cx"> description = "<!DOCTYPE " + description + ">";
</span><span class="lines">@@ -825,6 +658,7 @@
</span><span class="cx"> if (typeof obj === "function")
</span><span class="cx"> return this._toString(obj);
</span><span class="cx">
</span><ins>+ // FIXME: Can we remove this?
</ins><span class="cx"> if (className === "Object") {
</span><span class="cx"> // In Chromium DOM wrapper prototypes will have Object as their constructor name,
</span><span class="cx"> // get the real DOM wrapper name from the constructor property.
</span><span class="lines">@@ -835,10 +669,6 @@
</span><span class="cx"> return className;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {*} obj
- * @return {string}
- */
</del><span class="cx"> _toString: function(obj)
</span><span class="cx"> {
</span><span class="cx"> // We don't use String(obj) because inspectedGlobalObject.String is undefined if owning frame navigated to another page.
</span><span class="lines">@@ -846,26 +676,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * @type {InjectedScript}
- * @const
- */
-var injectedScript = new InjectedScript();
</del><ins>+var injectedScript = new InjectedScript;
</ins><span class="cx">
</span><del>-/**
- * @constructor
- * @param {*} object
- * @param {string=} objectGroupName
- * @param {boolean=} forceValueType
- * @param {boolean=} generatePreview
- * @param {?Array.<string>=} columnNames
- */
</del><ins>+
</ins><span class="cx"> InjectedScript.RemoteObject = function(object, objectGroupName, forceValueType, generatePreview, columnNames)
</span><span class="cx"> {
</span><span class="cx"> this.type = typeof object;
</span><ins>+
+ if (this.type === "undefined" && injectedScript._isHTMLAllCollection(object))
+ this.type = "object";
+
</ins><span class="cx"> if (injectedScript.isPrimitiveValue(object) || object === null || forceValueType) {
</span><span class="cx"> // We don't send undefined values over JSON.
</span><del>- if (typeof object !== "undefined")
</del><ins>+ if (this.type !== "undefined")
</ins><span class="cx"> this.value = object;
</span><span class="cx">
</span><span class="cx"> // Null object is object with 'null' subtype'
</span><span class="lines">@@ -873,17 +696,16 @@
</span><span class="cx"> this.subtype = "null";
</span><span class="cx">
</span><span class="cx"> // Provide user-friendly number values.
</span><del>- if (typeof object === "number")
</del><ins>+ if (this.type === "number")
</ins><span class="cx"> this.description = object + "";
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- object = /** @type {Object} */ (object);
-
</del><span class="cx"> this.objectId = injectedScript._bind(object, objectGroupName);
</span><span class="cx"> var subtype = injectedScript._subtype(object);
</span><span class="cx"> if (subtype)
</span><span class="cx"> this.subtype = subtype;
</span><ins>+
</ins><span class="cx"> this.className = InjectedScriptHost.internalConstructorName(object);
</span><span class="cx"> this.description = injectedScript._describe(object);
</span><span class="cx">
</span><span class="lines">@@ -892,12 +714,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript.RemoteObject.prototype = {
</span><del>- /**
- * @param {Object} object
- * @param {Array.<string>=} firstLevelKeys
- * @param {?Array.<string>=} secondLevelKeys
- * @return {Object} preview
- */
</del><span class="cx"> _generatePreview: function(object, firstLevelKeys, secondLevelKeys)
</span><span class="cx"> {
</span><span class="cx"> var preview = {};
</span><span class="lines">@@ -917,16 +733,9 @@
</span><span class="cx"> return preview;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} object
- * @param {Object} preview
- * @param {Object} propertiesThreshold
- * @param {Array.<string>=} firstLevelKeys
- * @param {Array.<string>=} secondLevelKeys
- */
</del><span class="cx"> _generateProtoPreview: function(object, preview, propertiesThreshold, firstLevelKeys, secondLevelKeys)
</span><span class="cx"> {
</span><del>- var propertyNames = firstLevelKeys ? firstLevelKeys : Object.keys(/** @type {!Object} */(object));
</del><ins>+ var propertyNames = firstLevelKeys ? firstLevelKeys : Object.keys(object);
</ins><span class="cx"> try {
</span><span class="cx"> for (var i = 0; i < propertyNames.length; ++i) {
</span><span class="cx"> if (!propertiesThreshold.properties || !propertiesThreshold.indexes) {
</span><span class="lines">@@ -938,7 +747,7 @@
</span><span class="cx"> if (this.subtype === "array" && name === "length")
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- var descriptor = Object.getOwnPropertyDescriptor(/** @type {!Object} */(object), name);
</del><ins>+ var descriptor = Object.getOwnPropertyDescriptor(object, name);
</ins><span class="cx"> if (!("value" in descriptor) || !descriptor.enumerable) {
</span><span class="cx"> preview.lossless = false;
</span><span class="cx"> continue;
</span><span class="lines">@@ -981,7 +790,7 @@
</span><span class="cx"> var subtype = injectedScript._subtype(value);
</span><span class="cx"> var description = "";
</span><span class="cx"> if (type !== "function")
</span><del>- description = this._abbreviateString(/** @type {string} */ (injectedScript._describe(value)), maxLength, subtype === "regexp");
</del><ins>+ description = this._abbreviateString(injectedScript._describe(value), maxLength, subtype === "regexp");
</ins><span class="cx">
</span><span class="cx"> var property = { name: name, type: type, value: description };
</span><span class="cx"> if (subtype)
</span><span class="lines">@@ -992,11 +801,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {Object} preview
- * @param {Object} property
- * @param {Object} propertiesThreshold
- */
</del><span class="cx"> _appendPropertyPreview: function(preview, property, propertiesThreshold)
</span><span class="cx"> {
</span><span class="cx"> if (isNaN(property.name))
</span><span class="lines">@@ -1006,81 +810,55 @@
</span><span class="cx"> preview.properties.push(property);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * @param {string} string
- * @param {number} maxLength
- * @param {boolean=} middle
- * @returns
- */
</del><span class="cx"> _abbreviateString: function(string, maxLength, middle)
</span><span class="cx"> {
</span><span class="cx"> if (string.length <= maxLength)
</span><span class="cx"> return string;
</span><ins>+
</ins><span class="cx"> if (middle) {
</span><span class="cx"> var leftHalf = maxLength >> 1;
</span><span class="cx"> var rightHalf = maxLength - leftHalf - 1;
</span><span class="cx"> return string.substr(0, leftHalf) + "\u2026" + string.substr(string.length - rightHalf, rightHalf);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return string.substr(0, maxLength) + "\u2026";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-/**
- * @constructor
- * @param {number} ordinal
- * @param {Object} callFrame
- */
</del><ins>+
</ins><span class="cx"> InjectedScript.CallFrameProxy = function(ordinal, callFrame)
</span><span class="cx"> {
</span><span class="cx"> this.callFrameId = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}";
</span><span class="cx"> this.functionName = (callFrame.type === "function" ? callFrame.functionName : "");
</span><del>- this.location = { scriptId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column };
</del><ins>+ this.location = {scriptId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column};
</ins><span class="cx"> this.scopeChain = this._wrapScopeChain(callFrame);
</span><span class="cx"> this.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript.CallFrameProxy.prototype = {
</span><del>- /**
- * @param {Object} callFrame
- * @return {!Array.<DebuggerAgent.Scope>}
- */
</del><span class="cx"> _wrapScopeChain: function(callFrame)
</span><span class="cx"> {
</span><span class="cx"> var scopeChain = callFrame.scopeChain;
</span><span class="cx"> var scopeChainProxy = [];
</span><del>- for (var i = 0; i < scopeChain.length; i++) {
- var scope = InjectedScript.CallFrameProxy._createScopeJson(callFrame.scopeType(i), scopeChain[i], "backtrace");
- scopeChainProxy.push(scope);
- }
</del><ins>+ for (var i = 0; i < scopeChain.length; i++)
+ scopeChainProxy[i] = InjectedScript.CallFrameProxy._createScopeJson(callFrame.scopeType(i), scopeChain[i], "backtrace");
</ins><span class="cx"> return scopeChainProxy;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * @param {number} scopeTypeCode
- * @param {*} scopeObject
- * @param {string} groupId
- * @return {!DebuggerAgent.Scope}
- */
-InjectedScript.CallFrameProxy._createScopeJson = function(scopeTypeCode, scopeObject, groupId) {
- const GLOBAL_SCOPE = 0;
- const LOCAL_SCOPE = 1;
- const WITH_SCOPE = 2;
- const CLOSURE_SCOPE = 3;
- const CATCH_SCOPE = 4;
- const FUNCTION_NAME_SCOPE = 5;
</del><ins>+InjectedScript.CallFrameProxy._scopeTypeNames = {
+ 0: "global", // GLOBAL_SCOPE
+ 1: "local", // LOCAL_SCOPE
+ 2: "with", // WITH_SCOPE
+ 3: "closure", // CLOSURE_SCOPE
+ 4: "catch", // CATCH_SCOPE
+ 5: "functionName", // FUNCTION_NAME_SCOPE
+}
</ins><span class="cx">
</span><del>- /** @type {!Object.<number, string>} */
- var scopeTypeNames = {};
- scopeTypeNames[GLOBAL_SCOPE] = "global";
- scopeTypeNames[LOCAL_SCOPE] = "local";
- scopeTypeNames[WITH_SCOPE] = "with";
- scopeTypeNames[CLOSURE_SCOPE] = "closure";
- scopeTypeNames[CATCH_SCOPE] = "catch";
- scopeTypeNames[FUNCTION_NAME_SCOPE] = "functionName";
-
</del><ins>+InjectedScript.CallFrameProxy._createScopeJson = function(scopeTypeCode, scopeObject, groupId)
+{
</ins><span class="cx"> return {
</span><span class="cx"> object: injectedScript._wrapObject(scopeObject, groupId),
</span><del>- type: /** @type {DebuggerAgent.ScopeType} */ (scopeTypeNames[scopeTypeCode])
</del><ins>+ type: InjectedScript.CallFrameProxy._scopeTypeNames[scopeTypeCode]
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>