OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 "bindings/core/v8/V8FileReader.h" | 32 #include "bindings/core/v8/V8FileReader.h" |
33 | 33 |
| 34 #include "bindings/core/v8/V8ArrayBuffer.h" |
34 #include "bindings/core/v8/V8Binding.h" | 35 #include "bindings/core/v8/V8Binding.h" |
35 #include "bindings/core/v8/custom/V8ArrayBufferCustom.h" | |
36 #include "core/dom/ExecutionContext.h" | 36 #include "core/dom/ExecutionContext.h" |
37 | 37 |
38 namespace blink { | 38 namespace blink { |
39 | 39 |
40 void V8FileReader::resultAttributeGetterCustom(const v8::PropertyCallbackInfo<v8
::Value>& info) | 40 void V8FileReader::resultAttributeGetterCustom(const v8::PropertyCallbackInfo<v8
::Value>& info) |
41 { | 41 { |
42 v8::Handle<v8::Object> holder = info.Holder(); | 42 v8::Handle<v8::Object> holder = info.Holder(); |
43 FileReader* impl = V8FileReader::toImpl(holder); | 43 FileReader* impl = V8FileReader::toImpl(holder); |
44 if (impl->readType() == FileReaderLoader::ReadAsArrayBuffer) { | 44 if (impl->readType() == FileReaderLoader::ReadAsArrayBuffer) { |
45 v8SetReturnValueFast(info, impl->arrayBufferResult(), impl); | 45 v8SetReturnValueFast(info, DOMArrayBuffer::create(impl->arrayBufferResul
t()), impl); |
46 return; | 46 return; |
47 } | 47 } |
48 v8SetReturnValueStringOrNull(info, impl->stringResult(), info.GetIsolate()); | 48 v8SetReturnValueStringOrNull(info, impl->stringResult(), info.GetIsolate()); |
49 } | 49 } |
50 | 50 |
51 } // namespace blink | 51 } // namespace blink |
OLD | NEW |