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

Side by Side Diff: third_party/WebKit/Source/modules/filesystem/DOMFileSystem.cpp

Issue 1609313002: Use BlobCallback in toBlob instead of FileCallback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase master and Renamed mimeType to contentType to match other bits in Blob.h Created 4 years, 11 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 "modules/filesystem/DOMFileSystem.h" 31 #include "modules/filesystem/DOMFileSystem.h"
32 32
33 #include "core/fileapi/FileCallback.h" 33 #include "core/fileapi/BlobCallback.h"
34 #include "modules/filesystem/DOMFilePath.h" 34 #include "modules/filesystem/DOMFilePath.h"
35 #include "modules/filesystem/DirectoryEntry.h" 35 #include "modules/filesystem/DirectoryEntry.h"
36 #include "modules/filesystem/ErrorCallback.h" 36 #include "modules/filesystem/ErrorCallback.h"
37 #include "modules/filesystem/FileEntry.h" 37 #include "modules/filesystem/FileEntry.h"
38 #include "modules/filesystem/FileSystemCallbacks.h" 38 #include "modules/filesystem/FileSystemCallbacks.h"
39 #include "modules/filesystem/FileWriter.h" 39 #include "modules/filesystem/FileWriter.h"
40 #include "modules/filesystem/FileWriterBaseCallback.h" 40 #include "modules/filesystem/FileWriterBaseCallback.h"
41 #include "modules/filesystem/FileWriterCallback.h" 41 #include "modules/filesystem/FileWriterCallback.h"
42 #include "modules/filesystem/MetadataCallback.h" 42 #include "modules/filesystem/MetadataCallback.h"
43 #include "platform/FileMetadata.h" 43 #include "platform/FileMetadata.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 reportError(errorCallback, FileError::create(FileError::ABORT_ERR)); 155 reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
156 return; 156 return;
157 } 157 }
158 158
159 FileWriter* fileWriter = FileWriter::create(executionContext()); 159 FileWriter* fileWriter = FileWriter::create(executionContext());
160 FileWriterBaseCallback* conversionCallback = ConvertToFileWriterCallback::cr eate(successCallback); 160 FileWriterBaseCallback* conversionCallback = ConvertToFileWriterCallback::cr eate(successCallback);
161 OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create (fileWriter, conversionCallback, errorCallback, m_context); 161 OwnPtr<AsyncFileSystemCallbacks> callbacks = FileWriterBaseCallbacks::create (fileWriter, conversionCallback, errorCallback, m_context);
162 fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter, c allbacks.release()); 162 fileSystem()->createFileWriter(createFileSystemURL(fileEntry), fileWriter, c allbacks.release());
163 } 163 }
164 164
165 void DOMFileSystem::createFile(const FileEntry* fileEntry, FileCallback* success Callback, ErrorCallback* errorCallback) 165 void DOMFileSystem::createFile(const FileEntry* fileEntry, BlobCallback* success Callback, ErrorCallback* errorCallback)
166 { 166 {
167 KURL fileSystemURL = createFileSystemURL(fileEntry); 167 KURL fileSystemURL = createFileSystemURL(fileEntry);
168 if (!fileSystem()) { 168 if (!fileSystem()) {
169 reportError(errorCallback, FileError::create(FileError::ABORT_ERR)); 169 reportError(errorCallback, FileError::create(FileError::ABORT_ERR));
170 return; 170 return;
171 } 171 }
172 172
173 fileSystem()->createSnapshotFileAndReadMetadata(fileSystemURL, SnapshotFileC allback::create(this, fileEntry->name(), fileSystemURL, successCallback, errorCa llback, m_context)); 173 fileSystem()->createSnapshotFileAndReadMetadata(fileSystemURL, SnapshotFileC allback::create(this, fileEntry->name(), fileSystemURL, successCallback, errorCa llback, m_context));
174 } 174 }
175 175
176 DEFINE_TRACE(DOMFileSystem) 176 DEFINE_TRACE(DOMFileSystem)
177 { 177 {
178 DOMFileSystemBase::trace(visitor); 178 DOMFileSystemBase::trace(visitor);
179 ActiveDOMObject::trace(visitor); 179 ActiveDOMObject::trace(visitor);
180 visitor->trace(m_rootEntry); 180 visitor->trace(m_rootEntry);
181 } 181 }
182 182
183 } // namespace blink 183 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h ('k') | third_party/WebKit/Source/modules/filesystem/FileEntry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698