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

Unified Diff: Source/core/fileapi/FileReader.cpp

Issue 23992003: blob hacking webcore style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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 | « Source/core/fileapi/File.cpp ('k') | Source/core/fileapi/FileReaderLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fileapi/FileReader.cpp
diff --git a/Source/core/fileapi/FileReader.cpp b/Source/core/fileapi/FileReader.cpp
index b654d9aa63e0093994a3a38b043ca24783fa2e3f..2ff2020c0d69010c47361ff2ea8aa35f2cc5413f 100644
--- a/Source/core/fileapi/FileReader.cpp
+++ b/Source/core/fileapi/FileReader.cpp
@@ -46,9 +46,9 @@ namespace WebCore {
namespace {
-const CString utf8BlobURL(Blob* blob)
+const CString utf8BlobUUID(Blob* blob)
{
- return blob->url().string().utf8();
+ return blob->uuid().utf8();
}
const CString utf8FilePath(Blob* blob)
@@ -97,7 +97,7 @@ void FileReader::readAsArrayBuffer(Blob* blob, ExceptionState& es)
if (!blob)
return;
- LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+ LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
readInternal(blob, FileReaderLoader::ReadAsArrayBuffer, es);
}
@@ -107,7 +107,7 @@ void FileReader::readAsBinaryString(Blob* blob, ExceptionState& es)
if (!blob)
return;
- LOG(FileAPI, "FileReader: reading as binary: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+ LOG(FileAPI, "FileReader: reading as binary: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
readInternal(blob, FileReaderLoader::ReadAsBinaryString, es);
}
@@ -117,7 +117,7 @@ void FileReader::readAsText(Blob* blob, const String& encoding, ExceptionState&
if (!blob)
return;
- LOG(FileAPI, "FileReader: reading as text: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+ LOG(FileAPI, "FileReader: reading as text: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
m_encoding = encoding;
readInternal(blob, FileReaderLoader::ReadAsText, es);
@@ -133,7 +133,7 @@ void FileReader::readAsDataURL(Blob* blob, ExceptionState& es)
if (!blob)
return;
- LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobURL(blob).data(), utf8FilePath(blob).data());
+ LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data());
readInternal(blob, FileReaderLoader::ReadAsDataURL, es);
}
@@ -157,7 +157,7 @@ void FileReader::readInternal(Blob* blob, FileReaderLoader::ReadType type, Excep
m_loader = adoptPtr(new FileReaderLoader(m_readType, this));
m_loader->setEncoding(m_encoding);
m_loader->setDataType(m_blob->type());
- m_loader->start(executionContext(), *m_blob);
+ m_loader->start(executionContext(), m_blob->blobDataHandle());
}
static void delayedAbort(ExecutionContext*, FileReader* reader)
« no previous file with comments | « Source/core/fileapi/File.cpp ('k') | Source/core/fileapi/FileReaderLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698