diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-05 17:34:47 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-06 10:04:14 +0000 |
commit | eaf1da4d961fbbda9455f9af3b23d1af777f43fa (patch) | |
tree | 95970599ecee31c4f7f940bc97ac98c61a3d0cad /chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc | |
parent | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (diff) |
BASELINE: Update Chromium to 73.0.3683.64
Change-Id: I76517dc277ba4e16bfd7e098fda3d079656b3b9f
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc b/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc index 5a1cc40c235..36491a4b86f 100644 --- a/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc +++ b/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc @@ -143,14 +143,16 @@ DOMArrayBuffer* FileReaderLoader::ArrayBufferResult() { if (!raw_data_ || error_code_ != FileErrorCode::kOK) return nullptr; - DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); - if (finished_loading_) { - array_buffer_result_ = result; - AdjustReportedMemoryUsageToV8( - -1 * static_cast<int64_t>(raw_data_->ByteLength())); - raw_data_.reset(); + if (!finished_loading_) { + return DOMArrayBuffer::Create( + ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength())); } - return result; + + array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer()); + AdjustReportedMemoryUsageToV8(-1 * + static_cast<int64_t>(raw_data_->ByteLength())); + raw_data_.reset(); + return array_buffer_result_; } String FileReaderLoader::StringResult() { |