Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1172)

Unified Diff: Source/devtools/front_end/AuditRules.js

Issue 148523012: DevTools: [CSS] remove getAllStylesheets method from protocol (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/AuditRules.js
diff --git a/Source/devtools/front_end/AuditRules.js b/Source/devtools/front_end/AuditRules.js
index 5a224d50fbfe9c07d17291e857053ab497bf5411..9de7f4a79f58d8d1d35f2bcbed7db271a5755557 100644
--- a/Source/devtools/front_end/AuditRules.js
+++ b/Source/devtools/front_end/AuditRules.js
@@ -479,25 +479,16 @@ WebInspector.AuditRules.UnusedCssRule.prototype = {
continuation(styleSheets);
}
- /**
- * @param {?Protocol.Error} error
- * @param {!Array.<!CSSAgent.CSSStyleSheetHeader>} styleSheetInfos
- */
- function allStylesCallback(error, styleSheetInfos)
- {
- if (progress.isCanceled())
- return;
-
- if (error || !styleSheetInfos || !styleSheetInfos.length)
- return evalCallback([]);
- var styleSheets = [];
- for (var i = 0; i < styleSheetInfos.length; ++i) {
- var info = styleSheetInfos[i];
- WebInspector.CSSStyleSheet.createForId(info.styleSheetId, styleSheetCallback.bind(null, styleSheets, info.sourceURL, i == styleSheetInfos.length - 1 ? evalCallback : null));
- }
+ var styleSheetInfos = WebInspector.cssModel.allStyleSheets();
+ if (!styleSheetInfos || !styleSheetInfos.length) {
+ evalCallback([]);
+ return;
+ }
+ var styleSheets = [];
+ for (var i = 0; i < styleSheetInfos.length; ++i) {
+ var info = styleSheetInfos[i];
+ WebInspector.CSSStyleSheet.createForId(info.id, styleSheetCallback.bind(null, styleSheets, info.sourceURL, i == styleSheetInfos.length - 1 ? evalCallback : null));
}
-
- CSSAgent.getAllStyleSheets(allStylesCallback);
},
__proto__: WebInspector.AuditRule.prototype
@@ -1149,27 +1140,18 @@ WebInspector.AuditRules.CSSRuleBase.prototype = {
*/
doRun: function(requests, result, callback, progress)
{
- CSSAgent.getAllStyleSheets(sheetsCallback.bind(this));
+ var headers = WebInspector.cssModel.allStyleSheets();
- /**
- * @param {?Protocol.Error} error
- * @param {!Array.<!CSSAgent.CSSStyleSheetHeader>} headers
- * @this {WebInspector.AuditRules.CSSRuleBase}
- */
- function sheetsCallback(error, headers)
- {
- if (error)
- return callback(null);
-
- if (!headers.length)
- return callback(null);
- for (var i = 0; i < headers.length; ++i) {
- var header = headers[i];
- if (header.disabled)
- continue; // Do not check disabled stylesheets.
+ if (!headers.length) {
+ callback(null);
+ return;
+ }
+ for (var i = 0; i < headers.length; ++i) {
+ var header = headers[i];
+ if (header.disabled)
+ continue; // Do not check disabled stylesheets.
- this._visitStyleSheet(header.styleSheetId, i === headers.length - 1 ? finishedCallback : null, result, progress);
- }
+ this._visitStyleSheet(header.id, i === headers.length - 1 ? finishedCallback : null, result, progress);
}
function finishedCallback()

Powered by Google App Engine
This is Rietveld 408576698