Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp

Issue 1964183004: Revert of Move DOMArrayBuffer, DOMArrayBufferViews and DataView to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "core/fileapi/FileReaderSync.h" 31 #include "core/fileapi/FileReaderSync.h"
32 32
33 #include "bindings/core/v8/ExceptionState.h" 33 #include "bindings/core/v8/ExceptionState.h"
34 #include "core/dom/DOMArrayBuffer.h" 34 #include "core/dom/DOMArrayBuffer.h"
35 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
36 #include "core/fileapi/Blob.h" 36 #include "core/fileapi/Blob.h"
37 #include "core/fileapi/FileError.h" 37 #include "core/fileapi/FileError.h"
38 #include "core/fileapi/FileReaderLoader.h" 38 #include "core/fileapi/FileReaderLoader.h"
39 #include "wtf/PassRefPtr.h"
39 40
40 namespace blink { 41 namespace blink {
41 42
42 FileReaderSync::FileReaderSync() 43 FileReaderSync::FileReaderSync()
43 { 44 {
44 } 45 }
45 46
46 DOMArrayBuffer* FileReaderSync::readAsArrayBuffer(ExecutionContext* executionCon text, Blob* blob, ExceptionState& exceptionState) 47 PassRefPtr<DOMArrayBuffer> FileReaderSync::readAsArrayBuffer(ExecutionContext* e xecutionContext, Blob* blob, ExceptionState& exceptionState)
47 { 48 {
48 ASSERT(blob); 49 ASSERT(blob);
49 50
50 FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, nullptr); 51 FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, nullptr);
51 startLoading(executionContext, loader, *blob, exceptionState); 52 startLoading(executionContext, loader, *blob, exceptionState);
52 53
53 return loader.arrayBufferResult(); 54 return loader.arrayBufferResult();
54 } 55 }
55 56
56 String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Bl ob* blob, ExceptionState& exceptionState) 57 String FileReaderSync::readAsBinaryString(ExecutionContext* executionContext, Bl ob* blob, ExceptionState& exceptionState)
(...skipping 26 matching lines...) Expand all
83 } 84 }
84 85
85 void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReader Loader& loader, const Blob& blob, ExceptionState& exceptionState) 86 void FileReaderSync::startLoading(ExecutionContext* executionContext, FileReader Loader& loader, const Blob& blob, ExceptionState& exceptionState)
86 { 87 {
87 loader.start(executionContext, blob.blobDataHandle()); 88 loader.start(executionContext, blob.blobDataHandle());
88 if (loader.errorCode()) 89 if (loader.errorCode())
89 FileError::throwDOMException(exceptionState, loader.errorCode()); 90 FileError::throwDOMException(exceptionState, loader.errorCode());
90 } 91 }
91 92
92 } // namespace blink 93 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderSync.h ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698