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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js

Issue 2702583003: DevTools: do not assign empty content to CSS UISourceCode in case of protocol error (Closed)
Patch Set: fix test Created 3 years, 10 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: third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
index 25421fcfd9d585865a6d8e0982eb98e5f7f86814..70ea3fa5ec41318bb14f2727f0f149489fe09b9f 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
@@ -52,7 +52,7 @@ SDK.CSSModel = class extends SDK.SDKModel {
/** @type {!Map.<string, !Object.<!Protocol.Page.FrameId, !Array.<!Protocol.CSS.StyleSheetId>>>} */
this._styleSheetIdsForURL = new Map();
- /** @type {!Map.<!SDK.CSSStyleSheetHeader, !Promise<string>>} */
+ /** @type {!Map.<!SDK.CSSStyleSheetHeader, !Promise<?string>>} */
this._originalStyleSheetText = new Map();
/** @type {!Multimap<string, !Protocol.CSS.StyleSheetId>} */
@@ -784,12 +784,12 @@ SDK.CSSModel = class extends SDK.SDKModel {
/**
* @param {!Protocol.CSS.StyleSheetId} styleSheetId
- * @return {!Promise<string>}
+ * @return {!Promise<?string>}
*/
_ensureOriginalStyleSheetText(styleSheetId) {
var header = this.styleSheetHeaderForId(styleSheetId);
if (!header)
- return Promise.resolve('');
+ return Promise.resolve(/** @type {?string} */ (null));
var promise = this._originalStyleSheetText.get(header);
if (!promise) {
promise = this.getStyleSheetText(header.id);
@@ -807,7 +807,7 @@ SDK.CSSModel = class extends SDK.SDKModel {
/**
* @param {!SDK.CSSStyleSheetHeader} header
- * @return {!Promise<string>}
+ * @return {!Promise<?string>}
*/
originalStyleSheetText(header) {
return this._ensureOriginalStyleSheetText(header.id);
@@ -909,24 +909,23 @@ SDK.CSSModel = class extends SDK.SDKModel {
/**
* @param {!Protocol.CSS.StyleSheetId} styleSheetId
- * @return {!Promise<string>}
+ * @return {!Promise<?string>}
*/
getStyleSheetText(styleSheetId) {
/**
* @param {?Protocol.Error} error
* @param {?string} text
- * @return {string}
+ * @return {?string}
*/
function textCallback(error, text) {
if (error || text === null) {
console.error('Failed to get text for stylesheet ' + styleSheetId + ': ' + error);
- text = '';
- // Fall through.
+ return null;
}
return SDK.CSSModel.trimSourceURL(text);
}
- return this._agent.getStyleSheetText(styleSheetId, textCallback).catchException(/** @type {string} */ (''));
+ return this._agent.getStyleSheetText(styleSheetId, textCallback).catchException(/** @type {?string} */ (null));
}
_resetStyleSheets() {

Powered by Google App Engine
This is Rietveld 408576698