Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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 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 "V8DedicatedWorkerGlobalScope.h" | 32 #include "V8DedicatedWorkerGlobalScope.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/V8Binding.h" | 36 #include "bindings/v8/V8Binding.h" | 
| 36 #include "bindings/v8/V8Utilities.h" | 37 #include "bindings/v8/V8Utilities.h" | 
| 37 #include "bindings/v8/V8WorkerGlobalScopeEventListener.h" | 38 #include "bindings/v8/V8WorkerGlobalScopeEventListener.h" | 
| 38 #include "core/workers/DedicatedWorkerGlobalScope.h" | 39 #include "core/workers/DedicatedWorkerGlobalScope.h" | 
| 39 #include "wtf/ArrayBuffer.h" | 40 #include "wtf/ArrayBuffer.h" | 
| 40 | 41 | 
| 41 namespace WebCore { | 42 namespace WebCore { | 
| 42 | 43 | 
| 43 void V8DedicatedWorkerGlobalScope::postMessageMethodCustom(const v8::FunctionCal lbackInfo<v8::Value>& args) | 44 void V8DedicatedWorkerGlobalScope::postMessageMethodCustom(const v8::FunctionCal lbackInfo<v8::Value>& args) | 
| 44 { | 45 { | 
| 45 DedicatedWorkerGlobalScope* workerGlobalScope = V8DedicatedWorkerGlobalScope ::toNative(args.Holder()); | 46 DedicatedWorkerGlobalScope* workerGlobalScope = V8DedicatedWorkerGlobalScope ::toNative(args.Holder()); | 
| 46 MessagePortArray ports; | 47 MessagePortArray ports; | 
| 47 ArrayBufferArray arrayBuffers; | 48 ArrayBufferArray arrayBuffers; | 
| 48 if (args.Length() > 1) { | 49 if (args.Length() > 1) { | 
| 49 if (!extractTransferables(args[1], ports, arrayBuffers, args.GetIsolate( ))) | 50 bool notASequence = false; | 
| 51 if (!extractTransferables( | |
| 52 args[1], ports, arrayBuffers, notASequence, args.GetIsolate())) { | |
| 
 
Mike West
2013/10/22 06:50:40
Nit: The line breaks here are strange. Generally s
 
sof
2013/10/22 16:06:56
Sorry, presubmit checks leading me to assume wrong
 
 | |
| 53 if (notASequence) { | |
| 54 throwTypeError(ExceptionMessages::failedToExecute( | |
| 55 "postMessage", "WorkerGlobalScope", ExceptionMessages::notAS equenceType("Second")), args.GetIsolate()); | |
| 
 
Mike West
2013/10/22 06:50:40
Nit: line breaks.
 
 | |
| 56 } | |
| 50 return; | 57 return; | 
| 58 } | |
| 51 } | 59 } | 
| 52 bool didThrow = false; | 60 bool didThrow = false; | 
| 53 RefPtr<SerializedScriptValue> message = | 61 RefPtr<SerializedScriptValue> message = | 
| 54 SerializedScriptValue::create(args[0], | 62 SerializedScriptValue::create(args[0], | 
| 55 &ports, | 63 &ports, | 
| 56 &arrayBuffers, | 64 &arrayBuffers, | 
| 57 didThrow, | 65 didThrow, | 
| 58 args.GetIsolate()); | 66 args.GetIsolate()); | 
| 59 if (didThrow) | 67 if (didThrow) | 
| 60 return; | 68 return; | 
| 61 ExceptionState es(args.GetIsolate()); | 69 ExceptionState es(args.GetIsolate()); | 
| 62 workerGlobalScope->postMessage(message.release(), &ports, es); | 70 workerGlobalScope->postMessage(message.release(), &ports, es); | 
| 63 es.throwIfNeeded(); | 71 es.throwIfNeeded(); | 
| 64 } | 72 } | 
| 65 | 73 | 
| 66 } // namespace WebCore | 74 } // namespace WebCore | 
| OLD | NEW |