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

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

Issue 30673002: More informative error messages for non-Transferables. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More informative error messages for non-Transferables. 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8MessagePort.h" 32 #include "V8MessagePort.h"
33 33
34 #include "bindings/v8/ExceptionMessages.h"
34 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
35 #include "bindings/v8/SerializedScriptValue.h" 36 #include "bindings/v8/SerializedScriptValue.h"
36 #include "bindings/v8/V8Binding.h" 37 #include "bindings/v8/V8Binding.h"
37 #include "bindings/v8/V8Utilities.h" 38 #include "bindings/v8/V8Utilities.h"
38 #include "core/dom/MessagePort.h" 39 #include "core/dom/MessagePort.h"
39 #include "wtf/ArrayBuffer.h" 40 #include "wtf/ArrayBuffer.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 void V8MessagePort::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::V alue>& args) 44 void V8MessagePort::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::V alue>& args)
44 { 45 {
45 MessagePort* messagePort = V8MessagePort::toNative(args.Holder()); 46 MessagePort* messagePort = V8MessagePort::toNative(args.Holder());
46 MessagePortArray portArray; 47 MessagePortArray portArray;
47 ArrayBufferArray arrayBufferArray; 48 ArrayBufferArray arrayBufferArray;
48 if (args.Length() > 1) { 49 if (args.Length() > 1) {
49 if (!extractTransferables(args[1], portArray, arrayBufferArray, args.Get Isolate())) 50 bool notASequence = false;
51 if (!extractTransferables(args[1], portArray, arrayBufferArray, notASequ ence, args.GetIsolate())) {
52 if (notASequence)
53 throwTypeError(ExceptionMessages::failedToExecute("postMessage", "MessagePort", ExceptionMessages::notASequenceType("Second")), args.GetIsolate( ));
50 return; 54 return;
55 }
51 } 56 }
52 bool didThrow = false; 57 bool didThrow = false;
53 RefPtr<SerializedScriptValue> message = 58 RefPtr<SerializedScriptValue> message =
54 SerializedScriptValue::create(args[0], 59 SerializedScriptValue::create(args[0],
55 &portArray, 60 &portArray,
56 &arrayBufferArray, 61 &arrayBufferArray,
57 didThrow, 62 didThrow,
58 args.GetIsolate()); 63 args.GetIsolate());
59 if (didThrow) 64 if (didThrow)
60 return; 65 return;
61 ExceptionState es(args.GetIsolate()); 66 ExceptionState es(args.GetIsolate());
62 messagePort->postMessage(message.release(), &portArray, es); 67 messagePort->postMessage(message.release(), &portArray, es);
63 es.throwIfNeeded(); 68 es.throwIfNeeded();
64 } 69 }
65 70
66 } // namespace WebCore 71 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8DedicatedWorkerGlobalScopeCustom.cpp ('k') | Source/bindings/v8/custom/V8WindowCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698