Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: Source/bindings/v8/custom/V8MessagePortCustom.cpp

Issue 38063003: Improve TypeError messages from failed array conversions. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Improve TypeError messages from failed array conversions. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 30 matching lines...) Expand all
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 void V8MessagePort::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::V alue>& args) 44 void V8MessagePort::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::V alue>& args)
45 { 45 {
46 MessagePort* messagePort = V8MessagePort::toNative(args.Holder()); 46 MessagePort* messagePort = V8MessagePort::toNative(args.Holder());
47 MessagePortArray portArray; 47 MessagePortArray portArray;
48 ArrayBufferArray arrayBufferArray; 48 ArrayBufferArray arrayBufferArray;
49 if (args.Length() > 1) { 49 if (args.Length() > 1) {
50 bool notASequence = false; 50 bool notASequence = false;
51 if (!extractTransferables(args[1], portArray, arrayBufferArray, notASequ ence, args.GetIsolate())) { 51 const int transferablesArgIndex = 1;
52 if (!extractTransferables(args[transferablesArgIndex], portArray, arrayB ufferArray, notASequence, args.GetIsolate())) {
52 if (notASequence) 53 if (notASequence)
53 throwTypeError(ExceptionMessages::failedToExecute("postMessage", "MessagePort", ExceptionMessages::notASequenceType("Second")), args.GetIsolate( )); 54 throwTypeError(ExceptionMessages::failedToExecute("postMessage", "MessagePort", ExceptionMessages::notASequenceTypeArgumentOrValue(transferables ArgIndex + 1)), args.GetIsolate());
54 return; 55 return;
55 } 56 }
56 } 57 }
57 bool didThrow = false; 58 bool didThrow = false;
58 RefPtr<SerializedScriptValue> message = 59 RefPtr<SerializedScriptValue> message =
59 SerializedScriptValue::create(args[0], 60 SerializedScriptValue::create(args[0],
60 &portArray, 61 &portArray,
61 &arrayBufferArray, 62 &arrayBufferArray,
62 didThrow, 63 didThrow,
63 args.GetIsolate()); 64 args.GetIsolate());
64 if (didThrow) 65 if (didThrow)
65 return; 66 return;
66 ExceptionState es(args.GetIsolate()); 67 ExceptionState es(args.GetIsolate());
67 messagePort->postMessage(message.release(), &portArray, es); 68 messagePort->postMessage(message.release(), &portArray, es);
68 es.throwIfNeeded(); 69 es.throwIfNeeded();
69 } 70 }
70 71
71 } // namespace WebCore 72 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8MessageEventCustom.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698