Chromium Code Reviews| Index: Source/core/inspector/InjectedScriptCanvasModuleSource.js |
| diff --git a/Source/core/inspector/InjectedScriptCanvasModuleSource.js b/Source/core/inspector/InjectedScriptCanvasModuleSource.js |
| index 848ddcadcb8d0c363a3eeca144fcfa88a07b7769..7d160f3f19e035933d37f987fc47c62117a56178 100644 |
| --- a/Source/core/inspector/InjectedScriptCanvasModuleSource.js |
| +++ b/Source/core/inspector/InjectedScriptCanvasModuleSource.js |
| @@ -406,7 +406,7 @@ Call.prototype = { |
| { |
| return !this._functionName; |
| }, |
| - |
| + |
| /** |
| * @return {!Array} |
| */ |
| @@ -532,7 +532,7 @@ Call.prototype = { |
| resource.setWrappedObject(replayResult); |
| } |
| } |
| - |
| + |
| this._thisObject = replayObject; |
| this._functionName = replayableCall.functionName(); |
| this._args = replayArgs; |
| @@ -1701,7 +1701,7 @@ WebGLProgramResource.prototype = { |
| var originalProgram = /** @type {!WebGLProgram} */ (gl.getParameter(gl.CURRENT_PROGRAM)); |
| var currentProgram = originalProgram; |
| - |
| + |
| data.uniforms.forEach(function(uniform) { |
| var uniformLocation = gl.getUniformLocation(program, uniform.name); |
| if (!uniformLocation) |
| @@ -4581,7 +4581,10 @@ InjectedCanvasModule.prototype = { |
| */ |
| _parseStringId: function(stringId) |
| { |
| - return InjectedScriptHost.evaluate("(" + stringId + ")"); |
| + var wrappedResult = InjectedScriptHost.evaluate("(" + stringId + ")"); |
|
kozyatinskiy1
2014/07/05 13:34:13
Fixed: wrap InjectedScruptHost.evaluate call,
|
| + if (wrappedResult.exceptionDetails) |
|
pfeldman
2014/07/05 20:11:06
So this code is weird (you have a check, but retur
|
| + throw wrappedResult.result; |
| + return wrappedResult.result; |
| } |
| } |