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

Unified Diff: third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js

Issue 2931143003: DevTools: make debugger's rawLocationToUILocation return nullable type (Closed)
Patch Set: add test Created 3 years, 6 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/bindings/DebuggerWorkspaceBinding.js
diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js b/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js
index fd440e77af22864c6622ce2a24d320484c96df2c..2c238dd94a53062f444f88b5395b81b8c7fe13d2 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js
@@ -108,7 +108,7 @@ Bindings.DebuggerWorkspaceBinding = class {
/**
* @param {!SDK.DebuggerModel.Location} rawLocation
- * @return {!Workspace.UILocation}
+ * @return {?Workspace.UILocation}
*/
rawLocationToUILocation(rawLocation) {
for (var i = 0; i < this._sourceMappings.length; ++i) {
@@ -161,7 +161,7 @@ Bindings.DebuggerWorkspaceBinding = class {
var rawLocation =
this.uiLocationToRawLocation(uiLocation.uiSourceCode, uiLocation.lineNumber, uiLocation.columnNumber);
if (rawLocation)
- return this.rawLocationToUILocation(rawLocation);
+ return this.rawLocationToUILocation(rawLocation) || uiLocation;
return uiLocation;
}
@@ -298,15 +298,13 @@ Bindings.DebuggerWorkspaceBinding.ModelData = class {
/**
* @param {!SDK.DebuggerModel.Location} rawLocation
- * @return {!Workspace.UILocation}
+ * @return {?Workspace.UILocation}
*/
_rawLocationToUILocation(rawLocation) {
var uiLocation = null;
uiLocation = uiLocation || this._compilerMapping.rawLocationToUILocation(rawLocation);
uiLocation = uiLocation || this._resourceMapping.rawLocationToUILocation(rawLocation);
uiLocation = uiLocation || this._defaultMapping.rawLocationToUILocation(rawLocation);
- // DefaultMapping ensures uiLocation for every rawLocation.
- console.assert(uiLocation);
return /** @type {!Workspace.UILocation} */ (uiLocation);
}
@@ -419,7 +417,7 @@ Bindings.DebuggerWorkspaceBinding.Location = class extends Bindings.LiveLocation
/**
* @override
- * @return {!Workspace.UILocation}
+ * @return {?Workspace.UILocation}
*/
uiLocation() {
var debuggerModelLocation = this._rawLocation;
@@ -466,7 +464,7 @@ Bindings.DebuggerWorkspaceBinding.StackTraceTopFrameLocation = class extends Bin
/**
* @override
- * @return {!Workspace.UILocation}
+ * @return {?Workspace.UILocation}
*/
uiLocation() {
return this._current.uiLocation();

Powered by Google App Engine
This is Rietveld 408576698