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

Unified Diff: third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp b/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
index 9b7348f29b92bfab8e6c1bea0e43b4cc5bb33aaf..f25d5cb76a9c85165a1acec11601707ec17e5fd7 100644
--- a/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
@@ -36,8 +36,8 @@
#include "core/dom/DOMImplementation.h"
#include "core/dom/Document.h"
#include "core/events/Event.h"
+#include "core/fileapi/BlobCallback.h"
#include "core/fileapi/File.h"
-#include "core/fileapi/FileCallback.h"
#include "core/fileapi/FileError.h"
#include "core/fileapi/FileReader.h"
#include "core/frame/LocalFrame.h"
@@ -440,7 +440,7 @@ private:
}
bool didGetEntry(Entry*);
- bool didGetFile(File*);
+ bool didGetFile(Blob*);
void didRead();
void reportResult(FileError::ErrorCode errorCode, const String* result = 0, const String* charset = 0)
@@ -491,7 +491,7 @@ bool FileContentRequest::didGetEntry(Entry* entry)
return true;
}
- FileCallback* successCallback = CallbackDispatcherFactory<FileCallback>::create(this, &FileContentRequest::didGetFile);
+ BlobCallback* successCallback = CallbackDispatcherFactory<BlobCallback>::create(this, &FileContentRequest::didGetFile);
ErrorCallback* errorCallback = CallbackDispatcherFactory<ErrorCallback>::create(this, &FileContentRequest::didHitError);
toFileEntry(entry)->file(successCallback, errorCallback);
@@ -501,9 +501,9 @@ bool FileContentRequest::didGetEntry(Entry* entry)
return true;
}
-bool FileContentRequest::didGetFile(File* file)
+bool FileContentRequest::didGetFile(Blob* file)
{
- Blob* blob = file->Blob::slice(m_start, m_end, IGNORE_EXCEPTION);
+ Blob* blob = file->slice(m_start, m_end, IGNORE_EXCEPTION);
m_reader->setOnload(this);
m_reader->setOnerror(this);
« no previous file with comments | « third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698