DevTools: added injectedScript.evaluateWithDetails, that return exception details if it occured

Source/core/inspector/InjectedScriptCanvasModuleSource.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 388 matching lines @@
         return this._functionName;
     },
 
     /**
      * @return {boolean}
      */
     isPropertySetter: function()
     {
         return !this._functionName;
     },
-    
+
     /**
      * @return {!Array}
      */
     args: function()
     {
         return this._args;
     },
 
     /**
      * @return {*}
@@ skipping 105 matching lines @@
             var replayFunction = replayObject[replayableCall.functionName()];
             console.assert(typeof replayFunction === "function", "Expected a function to replay");
             replayResult = replayFunction.apply(replayObject, replayArgs);
 
             if (replayableResult instanceof ReplayableResource) {
                 var resource = replayableResult.replay(cache);
                 if (!resource.wrappedObject())
                     resource.setWrappedObject(replayResult);
             }
         }
-    
+
         this._thisObject = replayObject;
         this._functionName = replayableCall.functionName();
         this._args = replayArgs;
         this._result = replayResult;
         this._stackTrace = replayableCall.stackTrace();
         this._freezed = true;
         var attachments = replayableCall.attachments();
         this._attachments = attachments ? TypeUtils.cloneObject(attachments) : null;
         return this;
     }
@@ skipping 1148 matching lines @@
      * @param {!Cache.<!Resource>} cache
      */
     _doReplayCalls: function(data, cache)
     {
         Resource.prototype._doReplayCalls.call(this, data, cache);
         var gl = WebGLRenderingContextResource.forObject(this).wrappedObject();
         var program = this.wrappedObject();
 
         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)
                 return;
             if (currentProgram !== program) {
                 currentProgram = program;
                 gl.useProgram(program);
             }
             var methodName = this._uniformMethodNameByType(gl, uniform.type);
             if (methodName.indexOf("Matrix") === -1)
@@ skipping 2859 matching lines @@
         }
         return result;
     },
 
     /**
      * @param {string} stringId
      * @return {{injectedScriptId: number, traceLogId: ?number, resourceId: ?number}}
      */
     _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 return .result in any case). Also,
we don't expect error to happen here, error in the id means that the client is
using malformed id.

+            throw wrappedResult.result;
+        return wrappedResult.result;
     }
 }
 
 var injectedCanvasModule = new InjectedCanvasModule();
 return injectedCanvasModule;
 
 })