Modified: trunk/Source/WebCore/ChangeLog (262429 => 262430)
--- trunk/Source/WebCore/ChangeLog 2020-06-02 17:14:48 UTC (rev 262429)
+++ trunk/Source/WebCore/ChangeLog 2020-06-02 18:10:55 UTC (rev 262430)
@@ -1,3 +1,19 @@
+2020-06-02 Tetsuharu Ohzeki <tetsuharu.ohz...@gmail.com>
+
+ Pass nullptr for the 2nd argument of FileReaderLoader
+ https://bugs.webkit.org/show_bug.cgi?id=212642
+
+ Reviewed by Darin Adler.
+
+ Instead of passing `0`, `nullptr` is better
+ because `FileReaderLoader` takes a pointer.
+
+ * fileapi/FileReaderSync.cpp:
+ (WebCore::FileReaderSync::readAsArrayBuffer):
+ (WebCore::FileReaderSync::readAsBinaryString):
+ (WebCore::FileReaderSync::readAsText):
+ (WebCore::FileReaderSync::readAsDataURL):
+
2020-06-02 Tim Horton <timothy_hor...@apple.com>
UIColor and NSColor WebCore::Color factories should return invalid colors for nil input colors
Modified: trunk/Source/WebCore/fileapi/FileReaderSync.cpp (262429 => 262430)
--- trunk/Source/WebCore/fileapi/FileReaderSync.cpp 2020-06-02 17:14:48 UTC (rev 262429)
+++ trunk/Source/WebCore/fileapi/FileReaderSync.cpp 2020-06-02 18:10:55 UTC (rev 262430)
@@ -45,7 +45,7 @@
ExceptionOr<RefPtr<ArrayBuffer>> FileReaderSync::readAsArrayBuffer(ScriptExecutionContext& scriptExecutionContext, Blob& blob)
{
- FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, 0);
+ FileReaderLoader loader(FileReaderLoader::ReadAsArrayBuffer, nullptr);
auto result = startLoading(scriptExecutionContext, loader, blob);
if (result.hasException())
return result.releaseException();
@@ -54,13 +54,13 @@
ExceptionOr<String> FileReaderSync::readAsBinaryString(ScriptExecutionContext& scriptExecutionContext, Blob& blob)
{
- FileReaderLoader loader(FileReaderLoader::ReadAsBinaryString, 0);
+ FileReaderLoader loader(FileReaderLoader::ReadAsBinaryString, nullptr);
return startLoadingString(scriptExecutionContext, loader, blob);
}
ExceptionOr<String> FileReaderSync::readAsText(ScriptExecutionContext& scriptExecutionContext, Blob& blob, const String& encoding)
{
- FileReaderLoader loader(FileReaderLoader::ReadAsText, 0);
+ FileReaderLoader loader(FileReaderLoader::ReadAsText, nullptr);
loader.setEncoding(encoding);
return startLoadingString(scriptExecutionContext, loader, blob);
}
@@ -67,7 +67,7 @@
ExceptionOr<String> FileReaderSync::readAsDataURL(ScriptExecutionContext& scriptExecutionContext, Blob& blob)
{
- FileReaderLoader loader(FileReaderLoader::ReadAsDataURL, 0);
+ FileReaderLoader loader(FileReaderLoader::ReadAsDataURL, nullptr);
loader.setDataType(blob.type());
return startLoadingString(scriptExecutionContext, loader, blob);
}
