summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/resources/extensions/send_request.js
diff options
context:
space:
mode:
authordmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 05:26:46 +0000
committerdmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 05:26:46 +0000
commit39f10bd4728af6571bc1ac72e53ea5ff584c3d93 (patch)
tree5e18a90d0825a2f4afb251ff20795c6bc8c6e6aa /chrome/renderer/resources/extensions/send_request.js
parent33011ae92c7774a4e5c252a8721b8f5338dc2567 (diff)
downloadchromium_src-39f10bd4728af6571bc1ac72e53ea5ff584c3d93.zip
chromium_src-39f10bd4728af6571bc1ac72e53ea5ff584c3d93.tar.gz
chromium_src-39f10bd4728af6571bc1ac72e53ea5ff584c3d93.tar.bz2
Revert 135602 - Allow serialization of ArrayBuffer params in extension/apps API methods
Caused these three tests to time out - apparently only in debug mode, which is perhaps why they were not caught by try runs: INCOMPLETE (5): TtsApiTest.RegisterEngine INCOMPLETE (6): TtsApiTest.EngineError INCOMPLETE (7): TtsApiTest.EngineWordCallbacks Original description: This changes the V8ValueConverter to do ArrayBuffer<->BinaryValue conversions, as well as supporting ArrayBufferView subclasses as request parameters (but not response ones, since that's unnecessary). Also adds an experimental API for testing ArrayBuffers in request/response parameters. This depends on WebKit changes in https://bugs.webkit.org/show_bug.cgi?id=84899 BUG=122675 TEST=Included browser tests should pass Review URL: http://codereview.chromium.org/10161038 TBR=asargent@chromium.org Review URL: https://chromiumcodereview.appspot.com/10388002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources/extensions/send_request.js')
-rw-r--r--chrome/renderer/resources/extensions/send_request.js11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/renderer/resources/extensions/send_request.js b/chrome/renderer/resources/extensions/send_request.js
index 2e79b8a..045e270 100644
--- a/chrome/renderer/resources/extensions/send_request.js
+++ b/chrome/renderer/resources/extensions/send_request.js
@@ -107,13 +107,8 @@ function sendRequest(functionName, args, argSchemas, opt_args) {
if (request.args === undefined)
request.args = null;
- // TODO(asargent) - convert all optional native functions to accept raw
- // v8 values instead of expecting JSON strings.
- var doStringify = false;
- if (opt_args.nativeFunction && !opt_args.noStringify)
- doStringify = true;
- var requestArgs = doStringify ?
- chromeHidden.JSON.stringify(request.args) : request.args;
+ var sargs = opt_args.noStringify ?
+ request.args : chromeHidden.JSON.stringify(request.args);
var nativeFunction = opt_args.nativeFunction || natives.StartRequest;
var requestId = natives.GetNextRequestId();
@@ -121,7 +116,7 @@ function sendRequest(functionName, args, argSchemas, opt_args) {
requests[requestId] = request;
var hasCallback =
(request.callback || opt_args.customCallback) ? true : false;
- return nativeFunction(functionName, requestArgs, requestId, hasCallback,
+ return nativeFunction(functionName, sargs, requestId, hasCallback,
opt_args.forIOThread);
}