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

Side by Side Diff: Source/bindings/v8/custom/V8WorkerCustom.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
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 #include "wtf/ArrayBuffer.h" 41 #include "wtf/ArrayBuffer.h"
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 void V8Worker::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> & args) 45 void V8Worker::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> & args)
46 { 46 {
47 Worker* worker = V8Worker::toNative(args.Holder()); 47 Worker* worker = V8Worker::toNative(args.Holder());
48 MessagePortArray ports; 48 MessagePortArray ports;
49 ArrayBufferArray arrayBuffers; 49 ArrayBufferArray arrayBuffers;
50 if (args.Length() > 1) { 50 if (args.Length() > 1) {
51 const int transferablesArgIndex = 1;
51 bool notASequence = false; 52 bool notASequence = false;
52 if (!extractTransferables(args[1], ports, arrayBuffers, notASequence, ar gs.GetIsolate())) { 53 if (!extractTransferables(args[transferablesArgIndex], ports, arrayBuffe rs, notASequence, args.GetIsolate())) {
53 if (notASequence) 54 if (notASequence)
54 throwTypeError(ExceptionMessages::failedToExecute("postMessage", "Worker", ExceptionMessages::notASequenceType("Second")), args.GetIsolate()); 55 throwTypeError(ExceptionMessages::failedToExecute("postMessage", "Worker", ExceptionMessages::notASequenceTypeArgumentOrValue(transferablesArgIn dex + 1)), args.GetIsolate());
55 return; 56 return;
56 } 57 }
57 } 58 }
58 bool didThrow = false; 59 bool didThrow = false;
59 RefPtr<SerializedScriptValue> message = 60 RefPtr<SerializedScriptValue> message =
60 SerializedScriptValue::create(args[0], 61 SerializedScriptValue::create(args[0],
61 &ports, 62 &ports,
62 &arrayBuffers, 63 &arrayBuffers,
63 didThrow, 64 didThrow,
64 args.GetIsolate()); 65 args.GetIsolate());
65 if (didThrow) 66 if (didThrow)
66 return; 67 return;
67 ExceptionState es(args.GetIsolate()); 68 ExceptionState es(args.GetIsolate());
68 worker->postMessage(message.release(), &ports, es); 69 worker->postMessage(message.release(), &ports, es);
69 es.throwIfNeeded(); 70 es.throwIfNeeded();
70 } 71 }
71 72
72 } // namespace WebCore 73 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8WindowCustom.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698