| Index: WebCore/fileapi/FileReader.cpp
|
| ===================================================================
|
| --- WebCore/fileapi/FileReader.cpp (revision 140218)
|
| +++ WebCore/fileapi/FileReader.cpp (working copy)
|
| @@ -90,7 +90,7 @@
|
| if (!blob)
|
| return;
|
|
|
| - LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
| + LOG(FileAPI, "FileReader: reading as array buffer: %s %s\n", blob->uuid().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
|
|
| readInternal(blob, FileReaderLoader::ReadAsArrayBuffer, ec);
|
| }
|
| @@ -100,7 +100,7 @@
|
| if (!blob)
|
| return;
|
|
|
| - LOG(FileAPI, "FileReader: reading as binary: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
| + LOG(FileAPI, "FileReader: reading as binary: %s %s\n", blob->uuid().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
|
|
| readInternal(blob, FileReaderLoader::ReadAsBinaryString, ec);
|
| }
|
| @@ -110,7 +110,7 @@
|
| if (!blob)
|
| return;
|
|
|
| - LOG(FileAPI, "FileReader: reading as text: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
| + LOG(FileAPI, "FileReader: reading as text: %s %s\n", blob->uuid().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
|
|
| m_encoding = encoding;
|
| readInternal(blob, FileReaderLoader::ReadAsText, ec);
|
| @@ -126,7 +126,7 @@
|
| if (!blob)
|
| return;
|
|
|
| - LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", blob->url().string().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
| + LOG(FileAPI, "FileReader: reading as data URL: %s %s\n", blob->uuid().utf8().data(), blob->isFile() ? toFile(blob)->path().utf8().data() : "");
|
|
|
| readInternal(blob, FileReaderLoader::ReadAsDataURL, ec);
|
| }
|
| @@ -191,7 +191,7 @@
|
| {
|
| if (m_loader) {
|
| m_loader->cancel();
|
| - m_loader = nullptr;
|
| + m_loader = 0;
|
| }
|
| m_state = DONE;
|
| }
|
|
|