Chromium Code Reviews| Index: third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js |
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js b/third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js |
| index 85d214e06efad6011204e3e9974bf4fca7dea040..1d3b9c1b35d16bff3eebdb884347e8bb4d1c1ba3 100644 |
| --- a/third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js |
| +++ b/third_party/WebKit/Source/platform/v8_inspector/DebuggerScript.js |
| @@ -92,9 +92,9 @@ DebuggerScript.getFunctionScopes = function(fun) |
| /** |
| * @param {Object} object |
| - * @return {?GeneratorObjectDetails} |
| + * @return {?RawLocation} |
| */ |
| -DebuggerScript.getGeneratorObjectDetails = function(object) |
| +DebuggerScript.getGeneratorObjectSuspendedLocation = function(object) |
| { |
| var mirror = MakeMirror(object, true /* transient */); |
| if (!mirror.isGenerator()) |
| @@ -103,21 +103,16 @@ DebuggerScript.getGeneratorObjectDetails = function(object) |
| var funcMirror = generatorMirror.func(); |
| if (!funcMirror.resolved()) |
| return null; |
| - var result = { |
| - "function": funcMirror.value(), |
| - "functionName": funcMirror.debugName(), |
| - "status": generatorMirror.status() |
| - }; |
| + var location = generatorMirror.sourceLocation(); |
| var script = funcMirror.script(); |
| - var location = generatorMirror.sourceLocation() || funcMirror.sourceLocation(); |
|
dgozman
2016/07/06 19:25:12
Let's revert back to what we had, and remove all e
kozy
2016/07/06 22:38:41
Done.
|
| if (script && location) { |
| - result["location"] = { |
| - "scriptId": String(script.id()), |
| - "lineNumber": location.line, |
| - "columnNumber": location.column |
| + return { |
| + scriptId: "" + script.id(), |
| + lineNumber: location.line, |
| + columnNumber: location.column |
| }; |
| } |
| - return result; |
| + return null; |
| } |
| /** |