OLD | NEW |
---|---|
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 13 matching lines...) Expand all Loading... | |
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 "V8Worker.h" | 32 #include "V8Worker.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/workers/Worker.h" | 39 #include "core/workers/Worker.h" |
39 #include "core/workers/WorkerGlobalScope.h" | 40 #include "core/workers/WorkerGlobalScope.h" |
40 #include "wtf/ArrayBuffer.h" | 41 #include "wtf/ArrayBuffer.h" |
41 | 42 |
42 namespace WebCore { | 43 namespace WebCore { |
43 | 44 |
44 void V8Worker::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> & args) | 45 void V8Worker::postMessageMethodCustom(const v8::FunctionCallbackInfo<v8::Value> & args) |
45 { | 46 { |
46 Worker* worker = V8Worker::toNative(args.Holder()); | 47 Worker* worker = V8Worker::toNative(args.Holder()); |
47 MessagePortArray ports; | 48 MessagePortArray ports; |
48 ArrayBufferArray arrayBuffers; | 49 ArrayBufferArray arrayBuffers; |
49 if (args.Length() > 1) { | 50 if (args.Length() > 1) { |
50 if (!extractTransferables(args[1], ports, arrayBuffers, args.GetIsolate( ))) | 51 bool notASequence = false; |
52 if (!extractTransferables( | |
53 args[1], ports, arrayBuffers, notASequence, args.GetIsolate())) { | |
Mike West
2013/10/22 06:50:40
Nit: line breaks.
| |
54 if (notASequence) { | |
55 throwTypeError(ExceptionMessages::failedToExecute( | |
Mike West
2013/10/22 06:50:40
Nit: line breaks.
| |
56 "postMessage", "Worker", ExceptionMessages::notASequenceType ("Second")), args.GetIsolate()); | |
57 } | |
51 return; | 58 return; |
59 } | |
52 } | 60 } |
53 bool didThrow = false; | 61 bool didThrow = false; |
54 RefPtr<SerializedScriptValue> message = | 62 RefPtr<SerializedScriptValue> message = |
55 SerializedScriptValue::create(args[0], | 63 SerializedScriptValue::create(args[0], |
56 &ports, | 64 &ports, |
57 &arrayBuffers, | 65 &arrayBuffers, |
58 didThrow, | 66 didThrow, |
59 args.GetIsolate()); | 67 args.GetIsolate()); |
60 if (didThrow) | 68 if (didThrow) |
61 return; | 69 return; |
62 ExceptionState es(args.GetIsolate()); | 70 ExceptionState es(args.GetIsolate()); |
63 worker->postMessage(message.release(), &ports, es); | 71 worker->postMessage(message.release(), &ports, es); |
64 es.throwIfNeeded(); | 72 es.throwIfNeeded(); |
65 } | 73 } |
66 | 74 |
67 } // namespace WebCore | 75 } // namespace WebCore |
OLD | NEW |