⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 267672 in webkit


Ignore:
Timestamp:
Sep 27, 2020, 1:00:09 PM (6 years ago)
Author:
Alan Coon
Message:

Cherry-pick r266611. rdar://problem/69594191

MediaRecorder timeslice parameter causing internal error on longer videos
​https://bugs.webkit.org/show_bug.cgi?id=216076
<rdar://problem/68209422>

Reviewed by Eric Carlson.

Source/WebCore:

Test: http/wpt/fetch/blob-range.html

  • platform/network/BlobResourceHandle.cpp: (WebCore::BlobResourceHandle::readDataAsync):

Source/WebKit:

Test: http/wpt/fetch/blob-range.html

  • NetworkProcess/NetworkDataTaskBlob.cpp: (WebKit::NetworkDataTaskBlob::readData): readData can be re-entrant so we need to reset m_currentItemReadSize before consuming data.

LayoutTests:

  • http/wpt/fetch/blob-range-expected.txt: Added.
  • http/wpt/fetch/blob-range.html: Added.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@266611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-610-branch
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-610-branch/LayoutTests/ChangeLog

    r267643 r267672  
     12020-09-27  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r266611. rdar://problem/69594191
     4
     5    MediaRecorder timeslice parameter causing internal error on longer videos
     6    https://bugs.webkit.org/show_bug.cgi?id=216076
     7    <rdar://problem/68209422>
     8   
     9    Reviewed by Eric Carlson.
     10   
     11    Source/WebCore:
     12   
     13    Test: http/wpt/fetch/blob-range.html
     14   
     15    * platform/network/BlobResourceHandle.cpp:
     16    (WebCore::BlobResourceHandle::readDataAsync):
     17   
     18    Source/WebKit:
     19   
     20    Test: http/wpt/fetch/blob-range.html
     21   
     22    * NetworkProcess/NetworkDataTaskBlob.cpp:
     23    (WebKit::NetworkDataTaskBlob::readData):
     24    readData can be re-entrant so we need to reset m_currentItemReadSize before consuming data.
     25   
     26    LayoutTests:
     27   
     28    * http/wpt/fetch/blob-range-expected.txt: Added.
     29    * http/wpt/fetch/blob-range.html: Added.
     30   
     31   
     32    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     33
     34    2020-09-04  Youenn Fablet  <youenn@apple.com>
     35
     36            MediaRecorder timeslice parameter causing internal error on longer videos
     37            https://bugs.webkit.org/show_bug.cgi?id=216076
     38            <rdar://problem/68209422>
     39
     40            Reviewed by Eric Carlson.
     41
     42            * http/wpt/fetch/blob-range-expected.txt: Added.
     43            * http/wpt/fetch/blob-range.html: Added.
     44
    1452020-09-25  Alan Coon  <alancoon@apple.com>
    246

  • branches/safari-610-branch/Source/WebCore/ChangeLog

    r267671 r267672  
     12020-09-27  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r266611. rdar://problem/69594191
     4
     5    MediaRecorder timeslice parameter causing internal error on longer videos
     6    https://bugs.webkit.org/show_bug.cgi?id=216076
     7    <rdar://problem/68209422>
     8   
     9    Reviewed by Eric Carlson.
     10   
     11    Source/WebCore:
     12   
     13    Test: http/wpt/fetch/blob-range.html
     14   
     15    * platform/network/BlobResourceHandle.cpp:
     16    (WebCore::BlobResourceHandle::readDataAsync):
     17   
     18    Source/WebKit:
     19   
     20    Test: http/wpt/fetch/blob-range.html
     21   
     22    * NetworkProcess/NetworkDataTaskBlob.cpp:
     23    (WebKit::NetworkDataTaskBlob::readData):
     24    readData can be re-entrant so we need to reset m_currentItemReadSize before consuming data.
     25   
     26    LayoutTests:
     27   
     28    * http/wpt/fetch/blob-range-expected.txt: Added.
     29    * http/wpt/fetch/blob-range.html: Added.
     30   
     31   
     32    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     33
     34    2020-09-04  Youenn Fablet  <youenn@apple.com>
     35
     36            MediaRecorder timeslice parameter causing internal error on longer videos
     37            https://bugs.webkit.org/show_bug.cgi?id=216076
     38            <rdar://problem/68209422>
     39
     40            Reviewed by Eric Carlson.
     41
     42            Test: http/wpt/fetch/blob-range.html
     43
     44            * platform/network/BlobResourceHandle.cpp:
     45            (WebCore::BlobResourceHandle::readDataAsync):
     46
    1472020-09-27  Alan Coon  <alancoon@apple.com>
    248

  • branches/safari-610-branch/Source/WebCore/platform/network/BlobResourceHandle.cpp

    r248846 r267672  
    457457
    458458    long long bytesToRead = item.length() - m_currentItemReadSize;
     459    ASSERT(bytesToRead >= 0);
    459460    if (bytesToRead > m_totalRemainingSize)
    460461        bytesToRead = m_totalRemainingSize;
    461     consumeData(reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize, static_cast<int>(bytesToRead));
     462
     463    auto* data = reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize;
    462464    m_currentItemReadSize = 0;
     465
     466    consumeData(data, static_cast<int>(bytesToRead));
    463467}
    464468

  • branches/safari-610-branch/Source/WebKit/ChangeLog

    r267670 r267672  
     12020-09-27  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r266611. rdar://problem/69594191
     4
     5    MediaRecorder timeslice parameter causing internal error on longer videos
     6    https://bugs.webkit.org/show_bug.cgi?id=216076
     7    <rdar://problem/68209422>
     8   
     9    Reviewed by Eric Carlson.
     10   
     11    Source/WebCore:
     12   
     13    Test: http/wpt/fetch/blob-range.html
     14   
     15    * platform/network/BlobResourceHandle.cpp:
     16    (WebCore::BlobResourceHandle::readDataAsync):
     17   
     18    Source/WebKit:
     19   
     20    Test: http/wpt/fetch/blob-range.html
     21   
     22    * NetworkProcess/NetworkDataTaskBlob.cpp:
     23    (WebKit::NetworkDataTaskBlob::readData):
     24    readData can be re-entrant so we need to reset m_currentItemReadSize before consuming data.
     25   
     26    LayoutTests:
     27   
     28    * http/wpt/fetch/blob-range-expected.txt: Added.
     29    * http/wpt/fetch/blob-range.html: Added.
     30   
     31   
     32    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     33
     34    2020-09-04  Youenn Fablet  <youenn@apple.com>
     35
     36            MediaRecorder timeslice parameter causing internal error on longer videos
     37            https://bugs.webkit.org/show_bug.cgi?id=216076
     38            <rdar://problem/68209422>
     39
     40            Reviewed by Eric Carlson.
     41
     42            Test: http/wpt/fetch/blob-range.html
     43
     44            * NetworkProcess/NetworkDataTaskBlob.cpp:
     45            (WebKit::NetworkDataTaskBlob::readData):
     46            readData can be re-entrant so we need to reset m_currentItemReadSize before consuming data.
     47
    1482020-09-27  Alan Coon  <alancoon@apple.com>
    249

  • branches/safari-610-branch/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp

    r263407 r267672  
    341341
    342342    long long bytesToRead = item.length() - m_currentItemReadSize;
     343    ASSERT(bytesToRead >= 0);
    343344    if (bytesToRead > m_totalRemainingSize)
    344345        bytesToRead = m_totalRemainingSize;
    345     consumeData(reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize, static_cast<int>(bytesToRead));
     346
     347    auto* data = reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize;
    346348    m_currentItemReadSize = 0;
     349
     350    consumeData(data, static_cast<int>(bytesToRead));
    347351}
    348352
Note: See TracChangeset for help on using the changeset viewer.