Changeset 268232 in webkit


Ignore:
Timestamp:
Oct 8, 2020, 5:03:09 PM (5 years ago)
Author:
achristensen@apple.com
Message:

FileReader.result should return null if it isn't done yet
​https://bugs.webkit.org/show_bug.cgi?id=217484

Reviewed by Geoffrey Garen.

LayoutTests/imported/w3c:

  • web-platform-tests/FileAPI/reading-data-section/filereader_result-expected.txt:

Source/WebCore:

This matches Chrome and Firefox.
Covered by newly passing web platform tests.

  • fileapi/FileReader.cpp:

(WebCore::FileReader::result const):

LayoutTests:

  • fast/files/read-file-async-expected.txt:
  • fast/files/workers/worker-read-file-async-expected.txt:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r268231 r268232  
     12020-10-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        FileReader.result should return null if it isn't done yet
     4        https://bugs.webkit.org/show_bug.cgi?id=217484
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * fast/files/read-file-async-expected.txt:
     9        * fast/files/workers/worker-read-file-async-expected.txt:
     10
    1112020-10-08  Peng Liu  <peng.liu6@apple.com>
    212

  • trunk/LayoutTests/fast/files/read-file-async-expected.txt

    r267644 r268232  
    195195Received loadend event
    196196readyState after recalling read method: 1
    197 result after recalling read method:
     197result after recalling read method: null
    198198error after recalling read method: null
    199199Received loadstart event
    … …  
    212212Received loadend event
    213213readyState after recalling read method: 1
    214 result after recalling read method:
     214result after recalling read method: null
    215215error after recalling read method: null
    216216Received loadstart event

  • trunk/LayoutTests/fast/files/workers/worker-read-file-async-expected.txt

    r267644 r268232  
    196196Received loadend event
    197197readyState after recalling read method: 1
    198 result after recalling read method:
     198result after recalling read method: null
    199199error after recalling read method: null
    200200Received loadstart event
    … …  
    213213Received loadend event
    214214readyState after recalling read method: 1
    215 result after recalling read method:
     215result after recalling read method: null
    216216error after recalling read method: null
    217217Received loadstart event

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r268228 r268232  
     12020-10-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        FileReader.result should return null if it isn't done yet
     4        https://bugs.webkit.org/show_bug.cgi?id=217484
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * web-platform-tests/FileAPI/reading-data-section/filereader_result-expected.txt:
     9
    1102020-10-08  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/LayoutTests/imported/w3c/web-platform-tests/FileAPI/reading-data-section/filereader_result-expected.txt

    r267651 r268232  
    44PASS readAsArrayBuffer
    55PASS readAsBinaryString
    6 FAIL result is null during "loadstart" event for readAsText assert_equals: result is null after first read call expected (object) null but got (string) ""
    7 FAIL result is null during "loadstart" event for readAsDataURL assert_equals: result is null after first read call expected (object) null but got (string) ""
    8 FAIL result is null during "loadstart" event for readAsArrayBuffer assert_equals: result is null during event expected null but got object "[object ArrayBuffer]"
    9 FAIL result is null during "loadstart" event for readAsBinaryString assert_equals: result is null after first read call expected (object) null but got (string) ""
    10 FAIL result is null during "progress" event for readAsText assert_equals: result is null after first read call expected (object) null but got (string) ""
    11 FAIL result is null during "progress" event for readAsDataURL assert_equals: result is null after first read call expected (object) null but got (string) ""
    12 FAIL result is null during "progress" event for readAsArrayBuffer assert_equals: result is null during event expected null but got object "[object ArrayBuffer]"
    13 FAIL result is null during "progress" event for readAsBinaryString assert_equals: result is null after first read call expected (object) null but got (string) ""
     6PASS result is null during "loadstart" event for readAsText
     7PASS result is null during "loadstart" event for readAsDataURL
     8PASS result is null during "loadstart" event for readAsArrayBuffer
     9PASS result is null during "loadstart" event for readAsBinaryString
     10PASS result is null during "progress" event for readAsText
     11PASS result is null during "progress" event for readAsDataURL
     12PASS result is null during "progress" event for readAsArrayBuffer
     13PASS result is null during "progress" event for readAsBinaryString
    1414

  • trunk/Source/WebCore/ChangeLog

    r268228 r268232  
     12020-10-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        FileReader.result should return null if it isn't done yet
     4        https://bugs.webkit.org/show_bug.cgi?id=217484
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        This matches Chrome and Firefox.
     9        Covered by newly passing web platform tests.
     10
     11        * fileapi/FileReader.cpp:
     12        (WebCore::FileReader::result const):
     13
    1142020-10-08  Alex Christensen  <achristensen@webkit.org>
    215

  • trunk/Source/WebCore/fileapi/FileReader.cpp

    r268054 r268232  
    224224Optional<Variant<String, RefPtr<JSC::ArrayBuffer>>> FileReader::result() const
    225225{
    226     if (!m_loader || m_error)
     226    if (!m_loader || m_error || m_state != DONE)
    227227        return WTF::nullopt;
    228228    if (m_readType == FileReaderLoader::ReadAsArrayBuffer) {
Note: See TracChangeset for help on using the changeset viewer.