| Index: Source/devtools/front_end/extensions/ExtensionAuditCategory.js
|
| diff --git a/Source/devtools/front_end/extensions/ExtensionAuditCategory.js b/Source/devtools/front_end/extensions/ExtensionAuditCategory.js
|
| index ddbb45cf29a5296b77c43de9e61eff3c2841237e..b892031553a73d09e0d62fb7f1e2edf9a699756d 100644
|
| --- a/Source/devtools/front_end/extensions/ExtensionAuditCategory.js
|
| +++ b/Source/devtools/front_end/extensions/ExtensionAuditCategory.js
|
| @@ -30,197 +30,44 @@
|
|
|
| /**
|
| * @constructor
|
| - * @implements {WebInspector.AuditCategory}
|
| - * @param {!WebInspector.ExtensionServer} server
|
| * @param {string} extensionOrigin
|
| * @param {string} id
|
| * @param {string} displayName
|
| * @param {number=} ruleCount
|
| */
|
| -WebInspector.ExtensionAuditCategory = function(server, extensionOrigin, id, displayName, ruleCount)
|
| +WebInspector.ExtensionAuditCategory = function(extensionOrigin, id, displayName, ruleCount)
|
| {
|
| - this._server = server;
|
| - this._extensionOrigin = extensionOrigin;
|
| - this._id = id;
|
| - this._displayName = displayName;
|
| - this._ruleCount = ruleCount;
|
| -}
|
| -
|
| -WebInspector.ExtensionAuditCategory.prototype = {
|
| - /**
|
| - * @override
|
| - */
|
| - get id()
|
| - {
|
| - return this._id;
|
| - },
|
| -
|
| - /**
|
| - * @override
|
| - */
|
| - get displayName()
|
| - {
|
| - return this._displayName;
|
| - },
|
| -
|
| - /**
|
| - * @override
|
| - * @param {!WebInspector.Target} target
|
| - * @param {!Array.<!WebInspector.NetworkRequest>} requests
|
| - * @param {function(!WebInspector.AuditRuleResult)} ruleResultCallback
|
| - * @param {function()} categoryDoneCallback
|
| - * @param {!WebInspector.Progress} progress
|
| - */
|
| - run: function(target, requests, ruleResultCallback, categoryDoneCallback, progress)
|
| - {
|
| - var results = new WebInspector.ExtensionAuditCategoryResults(this, target, ruleResultCallback, categoryDoneCallback, progress);
|
| - this._server.startAuditRun(this, results);
|
| - }
|
| + this.extensionOrigin = extensionOrigin;
|
| + this.id = id;
|
| + this.displayName = displayName;
|
| + this.ruleCount = ruleCount;
|
| }
|
|
|
| /**
|
| - * @constructor
|
| - * @param {!WebInspector.ExtensionAuditCategory} category
|
| - * @param {!WebInspector.Target} target
|
| - * @param {function(!WebInspector.AuditRuleResult)} ruleResultCallback
|
| - * @param {function()} categoryDoneCallback
|
| - * @param {!WebInspector.Progress} progress
|
| + * @interface
|
| */
|
| -WebInspector.ExtensionAuditCategoryResults = function(category, target, ruleResultCallback, categoryDoneCallback, progress)
|
| +WebInspector.ExtensionAuditCategoryResults = function()
|
| {
|
| - this._target = target;
|
| - this._category = category;
|
| - this._ruleResultCallback = ruleResultCallback;
|
| - this._categoryDoneCallback = categoryDoneCallback;
|
| - this._progress = progress;
|
| - this._progress.setTotalWork(1);
|
| - this._expectedResults = category._ruleCount;
|
| - this._actualResults = 0;
|
| -
|
| - this.id = category.id + "-" + ++WebInspector.ExtensionAuditCategoryResults._lastId;
|
| }
|
|
|
| WebInspector.ExtensionAuditCategoryResults.prototype = {
|
| - done: function()
|
| - {
|
| - this._category._server.stopAuditRun(this);
|
| - this._progress.done();
|
| - this._categoryDoneCallback();
|
| - },
|
| -
|
| - addResult: function(displayName, description, severity, details)
|
| - {
|
| - var result = new WebInspector.AuditRuleResult(displayName);
|
| - result.addChild(description);
|
| - result.severity = severity;
|
| - if (details)
|
| - this._addNode(result, details);
|
| - this._addResult(result);
|
| - },
|
| -
|
| - _addNode: function(parent, node)
|
| - {
|
| - var contents = WebInspector.auditFormatters.partiallyApply(WebInspector.ExtensionAuditFormatters, this, node.contents);
|
| - var addedNode = parent.addChild(contents, node.expanded);
|
| - if (node.children) {
|
| - for (var i = 0; i < node.children.length; ++i)
|
| - this._addNode(addedNode, node.children[i]);
|
| - }
|
| - },
|
| -
|
| - _addResult: function(result)
|
| - {
|
| - this._ruleResultCallback(result);
|
| - ++this._actualResults;
|
| - if (typeof this._expectedResults === "number") {
|
| - this._progress.setWorked(this._actualResults / this._expectedResults);
|
| - if (this._actualResults === this._expectedResults)
|
| - this.done();
|
| - }
|
| - },
|
| -
|
| - /**
|
| - * @param {number} progress
|
| - */
|
| - updateProgress: function(progress)
|
| - {
|
| - this._progress.setWorked(progress);
|
| - },
|
| -
|
| /**
|
| - * @param {string} expression
|
| - * @param {?Object} evaluateOptions
|
| - * @param {function(!WebInspector.RemoteObject)} callback
|
| + * @return {string}
|
| */
|
| - evaluate: function(expression, evaluateOptions, callback)
|
| - {
|
| - /**
|
| - * @param {?string} error
|
| - * @param {!RuntimeAgent.RemoteObject} result
|
| - * @param {boolean=} wasThrown
|
| - * @this {WebInspector.ExtensionAuditCategoryResults}
|
| - */
|
| - function onEvaluate(error, result, wasThrown)
|
| - {
|
| - if (wasThrown)
|
| - return;
|
| - var object = this._target.runtimeModel.createRemoteObject(result);
|
| - callback(object);
|
| - }
|
| - this._category._server.evaluate(expression, false, false, evaluateOptions, this._category._extensionOrigin, onEvaluate.bind(this));
|
| - }
|
| -}
|
| + id: function() { },
|
|
|
| -WebInspector.ExtensionAuditFormatters = {
|
| /**
|
| - * @this {WebInspector.ExtensionAuditCategoryResults}
|
| - * @param {string} expression
|
| - * @param {string} title
|
| - * @param {?Object} evaluateOptions
|
| - * @return {!Element}
|
| + * @param {string} displayName
|
| + * @param {string} description
|
| + * @param {string} severity
|
| + * @param {!Object} details
|
| */
|
| - object: function(expression, title, evaluateOptions)
|
| - {
|
| - var parentElement = createElement("div");
|
| - function onEvaluate(remoteObject)
|
| - {
|
| - var section = new WebInspector.ObjectPropertiesSection(remoteObject, title);
|
| - section.expanded = true;
|
| - section.editable = false;
|
| - parentElement.appendChild(section.element);
|
| - }
|
| - this.evaluate(expression, evaluateOptions, onEvaluate);
|
| - return parentElement;
|
| - },
|
| + addResult: function(displayName, description, severity, details) { },
|
|
|
| /**
|
| - * @this {WebInspector.ExtensionAuditCategoryResults}
|
| - * @param {string} expression
|
| - * @param {?Object} evaluateOptions
|
| - * @return {!Element}
|
| + * @param {number} progress
|
| */
|
| - node: function(expression, evaluateOptions)
|
| - {
|
| - var parentElement = createElement("div");
|
| - this.evaluate(expression, evaluateOptions, onEvaluate);
|
| -
|
| - /**
|
| - * @param {!WebInspector.RemoteObject} remoteObject
|
| - */
|
| - function onEvaluate(remoteObject)
|
| - {
|
| - WebInspector.Renderer.renderPromise(remoteObject).then(appendRenderer).thenOrCatch(remoteObject.release.bind(remoteObject)).done();
|
| + updateProgress: function(progress) { },
|
|
|
| - /**
|
| - * @param {!Element} element
|
| - */
|
| - function appendRenderer(element)
|
| - {
|
| - parentElement.appendChild(element);
|
| - }
|
| - }
|
| - return parentElement;
|
| - }
|
| + done: function() { }
|
| }
|
| -
|
| -WebInspector.ExtensionAuditCategoryResults._lastId = 0;
|
|
|