Chromium Code Reviews| Index: LayoutTests/http/tests/inspector/inspector-test.js |
| diff --git a/LayoutTests/http/tests/inspector/inspector-test.js b/LayoutTests/http/tests/inspector/inspector-test.js |
| index 62baa8cc4b78430b05920432c3f8b7a0b259d8d2..e2d81e32aa9a973a0afcfe6a44e0f2411e95163e 100644 |
| --- a/LayoutTests/http/tests/inspector/inspector-test.js |
| +++ b/LayoutTests/http/tests/inspector/inspector-test.js |
| @@ -114,25 +114,30 @@ InspectorTest.didInvokePageFunctionPromise = function(callId, value, didResolve) |
| callback(value); |
| } |
| -InspectorTest.invokePageFunctionAsync = function(functionName, callback) |
| +InspectorTest.invokePageFunctionAsync = function(functionName, optionalArgs, callback) |
|
dgozman
2015/07/31 06:50:38
Should comment or annotate that optionalArgs is no
|
| { |
| var id = ++lastEvalId; |
| + var args = Array.prototype.slice.call(arguments, 1); |
| + var callback = args.pop(); |
| pendingEvalRequests[id] = InspectorTest.safeWrap(callback); |
| - var asyncEvalWrapper = function(callId, functionName) |
| + var asyncEvalWrapper = function(callId, functionName, argsString) |
| { |
| function evalCallback(result) |
| { |
| testRunner.evaluateInWebInspector(evalCallbackCallId, "InspectorTest.didInvokePageFunctionAsync(" + callId + ", " + JSON.stringify(result) + ");"); |
| } |
| - |
| + var argsArray = argsString.replace(/^\[(.*)\]$/, "$1"); |
| + if (argsArray.length) |
| + argsArray += ","; |
| try { |
| - eval(functionName + "(" + evalCallback + ")"); |
| + eval(functionName + "(" + argsArray + evalCallback + ")"); |
| } catch(e) { |
| InspectorTest.addResult("Error: " + e); |
| evalCallback(String(e)); |
| } |
| } |
| - InspectorTest.evaluateInPage("(" + asyncEvalWrapper.toString() + ")(" + id + ", unescape('" + escape(functionName) + "'))"); |
| + var escapedJSONArgs = JSON.stringify(JSON.stringify(args)); |
| + InspectorTest.evaluateInPage("(" + asyncEvalWrapper.toString() + ")(" + id + ", unescape('" + escape(functionName) + "')," + escapedJSONArgs + ")"); |
| } |
| InspectorTest.didInvokePageFunctionAsync = function(callId, value) |