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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 PassRefPtr<DOMArrayBuffer> FileReaderSync::readAsArrayBuffer(ExecutionContext* e
xecutionContext, Blob* blob, ExceptionState& exceptionState) | 48 PassRefPtr<DOMArrayBuffer> FileReaderSync::readAsArrayBuffer(ExecutionContext* e
xecutionContext, Blob* blob, ExceptionState& exceptionState) |
49 { | 49 { |
50 if (!blob) { | 50 if (!blob) { |
51 exceptionState.throwDOMException(NotFoundError, FileError::notFoundError
Message); | 51 exceptionState.throwDOMException(NotFoundError, FileError::notFoundError
Message); |
52 return nullptr; | 52 return nullptr; |
53 } | 53 } |
54 | 54 |
55 FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, nullptr); | 55 FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, nullptr); |
56 startLoading(executionContext, loader, *blob, exceptionState); | 56 startLoading(executionContext, loader, *blob, exceptionState); |
57 | 57 |
58 return loader.arrayBufferResult(); | 58 RefPtr<DOMArrayBuffer> result = loader.arrayBufferResultOrNull(); |
| 59 // FIXME(crbug.com/536816): Instead of crashing on OOM here, we should |
| 60 // probably throw a RangeError exception which is what the ECMAScript |
| 61 // spec says to do when allocation fails. However, the File API spec |
| 62 // would need to be modified to state that execption thrown by referenced |
| 63 // procedures are re-thrown. |
| 64 RELEASE_ASSERT(result); // This is essentially an OOM crash |
| 65 return result.release(); |
59 } | 66 } |
60 | 67 |
61 String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Bl
ob* blob, ExceptionState& exceptionState) | 68 String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Bl
ob* blob, ExceptionState& exceptionState) |
62 { | 69 { |
63 if (!blob) { | 70 if (!blob) { |
64 exceptionState.throwDOMException(NotFoundError, FileError::notFoundError
Message); | 71 exceptionState.throwDOMException(NotFoundError, FileError::notFoundError
Message); |
65 return String(); | 72 return String(); |
66 } | 73 } |
67 | 74 |
68 FileReaderLoader loader(FileReaderLoader::ReadAsBinaryString, 0); | 75 FileReaderLoader loader(FileReaderLoader::ReadAsBinaryString, 0); |
(...skipping 28 matching lines...) Expand all Loading... |
97 } | 104 } |
98 | 105 |
99 void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReader
Loader& loader, const Blob& blob, ExceptionState& exceptionState) | 106 void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReader
Loader& loader, const Blob& blob, ExceptionState& exceptionState) |
100 { | 107 { |
101 loader.start(executionContext, blob.blobDataHandle()); | 108 loader.start(executionContext, blob.blobDataHandle()); |
102 if (loader.errorCode()) | 109 if (loader.errorCode()) |
103 FileError::throwDOMException(exceptionState, loader.errorCode()); | 110 FileError::throwDOMException(exceptionState, loader.errorCode()); |
104 } | 111 } |
105 | 112 |
106 } // namespace blink | 113 } // namespace blink |
OLD | NEW |