diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc index fe98c96986ed..1b7152f55fab 100644 --- a/media/filters/chunk_demuxer.cc +++ b/media/filters/chunk_demuxer.cc @@ -506,6 +506,9 @@ void ChunkDemuxerStream::CompletePendingReadIfPossible_Locked() { // Other cases are kOk and just return the buffers. DCHECK(!buffers.empty()); requested_buffer_count_ = 0; +#if defined(STARBOARD) + write_head_ = std::max(write_head_, buffers.back()->timestamp()); +#endif // defined(STARBOARD) std::move(read_cb_).Run(kOk, std::move(buffers)); } diff --git a/third_party/markupsafe/METADATA b/third_party/markupsafe/METADATA index b98d16f11ad1..df2caa9efa09 100644 --- a/third_party/markupsafe/METADATA +++ b/third_party/markupsafe/METADATA @@ -6,12 +6,12 @@ description: third_party { identifier { type: "ChromiumVersion" - value: "108.0.5359.243" # from https://chromereleases.googleblog.com/2023/09/long-term-support-channel-update-for_18.html + value: "114.0.5735.358" # from https://chromereleases.googleblog.com/2024/03/long-term-support-channel-update-for_26.html } identifier { type: "Git" value: "https://chromium.googlesource.com/chromium/src.git" - version: "60f10bcddac0f909b6ba2ddbaf2b49ca9c5ba714" + version: "1759c6ae9316996b9f150c0ce9d0ca78a3d15c02" } identifier { type: "UpstreamSubdir" diff --git a/third_party/markupsafe/README.chromium b/third_party/markupsafe/README.chromium index 0fcab52fa2b4..ba79d61ef7a7 100644 --- a/third_party/markupsafe/README.chromium +++ b/third_party/markupsafe/README.chromium @@ -22,3 +22,4 @@ Also includes install script (get_markupsafe.sh) and files of hashes (MD5 is also posted on website, SHA-512 computed locally); script checks hash then unpacks archive and installs desired files. Retrieve or update by executing markupsafe/get_markupsafe.sh from third_party. +We also add markupsafe.gni to list sources. \ No newline at end of file diff --git a/third_party/markupsafe/markupsafe.gni b/third_party/markupsafe/markupsafe.gni new file mode 100644 index 000000000000..89c24ef0fca5 --- /dev/null +++ b/third_party/markupsafe/markupsafe.gni @@ -0,0 +1,6 @@ +markupsafe_sources = [ + "//third_party/markupsafe/__init__.py", + "//third_party/markupsafe/_compat.py", + "//third_party/markupsafe/_constants.py", + "//third_party/markupsafe/_native.py", +]