Changeset 266611 in webkit

Timestamp:

Sep 4, 2020, 9:11:10 AM (6 years ago)

Author:

youenn@apple.com

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/fetch/blob-range-expected.txt (added)
• LayoutTests/http/wpt/fetch/blob-range.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/BlobResourceHandle.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-04  Youenn Fablet  <youenn@apple.com>
+
+        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.
+
+        * http/wpt/fetch/blob-range-expected.txt: Added.
+        * http/wpt/fetch/blob-range.html: Added.
+
 2020-09-04  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-04  Youenn Fablet  <youenn@apple.com>
+
+        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.
+
+        Test: http/wpt/fetch/blob-range.html
+
+        * platform/network/BlobResourceHandle.cpp:
+        (WebCore::BlobResourceHandle::readDataAsync):
+
 2020-09-04  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp

@@ -457 +457 @@
 
     long long bytesToRead = item.length() - m_currentItemReadSize;
+    ASSERT(bytesToRead >= 0);
     if (bytesToRead > m_totalRemainingSize)
         bytesToRead = m_totalRemainingSize;
-    consumeData(reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize, static_cast<int>(bytesToRead));
+
+    auto* data = reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize;
     m_currentItemReadSize = 0;
+
+    consumeData(data, static_cast<int>(bytesToRead));
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-04  Youenn Fablet  <youenn@apple.com>
+
+        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.
+
+        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.
+
 2020-09-04  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp

@@ -341 +341 @@
 
     long long bytesToRead = item.length() - m_currentItemReadSize;
+    ASSERT(bytesToRead >= 0);
     if (bytesToRead > m_totalRemainingSize)
         bytesToRead = m_totalRemainingSize;
-    consumeData(reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize, static_cast<int>(bytesToRead));
+
+    auto* data = reinterpret_cast<const char*>(item.data().data()->data()) + item.offset() + m_currentItemReadSize;
     m_currentItemReadSize = 0;
+
+    consumeData(data, static_cast<int>(bytesToRead));
 }