OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 "public/web/WebArrayBufferConverter.h" | 32 #include "public/web/WebArrayBufferConverter.h" |
33 | 33 |
34 #include "bindings/core/v8/custom/V8ArrayBufferCustom.h" | 34 #include "bindings/core/v8/V8ArrayBuffer.h" |
35 #include "wtf/ArrayBuffer.h" | |
36 #include "wtf/PassOwnPtr.h" | |
37 | 35 |
38 namespace blink { | 36 namespace blink { |
39 | 37 |
40 v8::Handle<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer,
v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) | 38 v8::Handle<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer,
v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
41 { | 39 { |
42 if (!buffer) | 40 if (!buffer) |
43 return v8::Handle<v8::Value>(); | 41 return v8::Handle<v8::Value>(); |
44 return toV8(*buffer, creationContext, isolate); | 42 return toV8(DOMArrayBuffer::create(*buffer), creationContext, isolate); |
45 } | 43 } |
46 | 44 |
47 WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Handle<v8::Value>
value, v8::Isolate* isolate) | 45 WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Handle<v8::Value>
value, v8::Isolate* isolate) |
48 { | 46 { |
49 if (!V8ArrayBuffer::hasInstance(value, isolate)) | 47 if (!V8ArrayBuffer::hasInstance(value, isolate)) |
50 return 0; | 48 return 0; |
51 ArrayBuffer* buffer = V8ArrayBuffer::toImpl(value->ToObject()); | 49 DOMArrayBuffer* buffer = V8ArrayBuffer::toImpl(value->ToObject()); |
52 return new WebArrayBuffer(buffer); | 50 return new WebArrayBuffer(buffer->buffer()); |
53 } | 51 } |
54 | 52 |
55 } // namespace blink | 53 } // namespace blink |
56 | |
OLD | NEW |