Chromium Code Reviews| Index: third_party/WebKit/Source/core/fileapi/FileReader.cpp |
| diff --git a/third_party/WebKit/Source/core/fileapi/FileReader.cpp b/third_party/WebKit/Source/core/fileapi/FileReader.cpp |
| index 3b4554871dee346d4e92f38164d1dc2f114245c7..151c9b070dc0b63e9cfda1d8699865b1b96b478b 100644 |
| --- a/third_party/WebKit/Source/core/fileapi/FileReader.cpp |
| +++ b/third_party/WebKit/Source/core/fileapi/FileReader.cpp |
| @@ -51,7 +51,6 @@ namespace blink { |
| namespace { |
| -#if !LOG_DISABLED |
| const CString utf8BlobUUID(Blob* blob) |
|
jianli
2016/04/06 20:06:07
Will these 2 functions be included in release buil
|
| { |
| return blob->uuid().utf8(); |
| @@ -61,7 +60,6 @@ const CString utf8FilePath(Blob* blob) |
| { |
| return blob->hasBackingFile() ? toFile(blob)->path().utf8() : ""; |
| } |
| -#endif |
| } // namespace |
| @@ -239,7 +237,7 @@ bool FileReader::hasPendingActivity() const |
| void FileReader::readAsArrayBuffer(Blob* blob, ExceptionState& exceptionState) |
| { |
| ASSERT(blob); |
| - WTF_LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data()); |
| + DVLOG(1) << "reading as array buffer: " << utf8BlobUUID(blob).data() << " " << utf8FilePath(blob).data(); |
| readInternal(blob, FileReaderLoader::ReadAsArrayBuffer, exceptionState); |
| } |
| @@ -247,7 +245,7 @@ void FileReader::readAsArrayBuffer(Blob* blob, ExceptionState& exceptionState) |
| void FileReader::readAsBinaryString(Blob* blob, ExceptionState& exceptionState) |
| { |
| ASSERT(blob); |
| - WTF_LOG(FileAPI, "FileReader: reading as binary: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data()); |
| + DVLOG(1) << "reading as binary: " << utf8BlobUUID(blob).data() << " " << utf8FilePath(blob).data(); |
| readInternal(blob, FileReaderLoader::ReadAsBinaryString, exceptionState); |
| } |
| @@ -255,7 +253,7 @@ void FileReader::readAsBinaryString(Blob* blob, ExceptionState& exceptionState) |
| void FileReader::readAsText(Blob* blob, const String& encoding, ExceptionState& exceptionState) |
| { |
| ASSERT(blob); |
| - WTF_LOG(FileAPI, "FileReader: reading as text: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data()); |
| + DVLOG(1) << "reading as text: " << utf8BlobUUID(blob).data() << " " << utf8FilePath(blob).data(); |
| m_encoding = encoding; |
| readInternal(blob, FileReaderLoader::ReadAsText, exceptionState); |
| @@ -269,7 +267,7 @@ void FileReader::readAsText(Blob* blob, ExceptionState& exceptionState) |
| void FileReader::readAsDataURL(Blob* blob, ExceptionState& exceptionState) |
| { |
| ASSERT(blob); |
| - WTF_LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", utf8BlobUUID(blob).data(), utf8FilePath(blob).data()); |
| + DVLOG(1) << "reading as data URL: " << utf8BlobUUID(blob).data() << " " << utf8FilePath(blob).data(); |
| readInternal(blob, FileReaderLoader::ReadAsDataURL, exceptionState); |
| } |
| @@ -331,7 +329,7 @@ static void delayedAbort(FileReader* reader) |
| void FileReader::abort() |
| { |
| - WTF_LOG(FileAPI, "FileReader: aborting\n"); |
| + DVLOG(1) << "aborting"; |
| if (m_loadingState != LoadingStateLoading |
| && m_loadingState != LoadingStatePending) { |