eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-25 17:25:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Handle interrupted fetches in the media element

Browse Source
This commit is contained in:
Zaggy1024
2026-02-25 18:28:17 -06:00
committed by Gregory Bertilson
parent fa7f1792bc
commit 57e36ce77c
Notes: github-actions[bot] 2026-02-27 04:04:26 +00:00 
Author: https://github.com/Zaggy1024
Commit: https://github.com/LadybirdBrowser/ladybird/commit/57e36ce77c6
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8179
Reviewed-by: https://github.com/shannonbooth
Reviewed-by: https://github.com/trflynn89
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Libraries/LibWeb/HTML/HTMLMediaElement.cpp
View File

@@ -1168,11 +1168,21 @@ void HTMLMediaElement::fetch_resource(NonnullRefPtr<FetchData> const& fetch_data
});
});
VERIFY(response->body());
auto empty_algorithm = GC::create_function(weak_self->heap(), [](JS::Value) { });
// 5. Otherwise, incrementally read response's body given updateMedia, processEndOfMedia, an empty algorithm, and global.
response->body()->incrementally_read(update_media, process_end_of_media, empty_algorithm, GC::Ref { global });
// AD-HOC: We need to pass a non-empty error algorithm in order to invoke the requisite steps.
auto process_body_error = GC::create_function(weak_self->heap(), [weak_self, fetch_generation](JS::Value) {
if (!weak_self)
return;
if (fetch_generation != weak_self->m_current_fetch_generation)
return;
weak_self->queue_a_media_element_task([self = weak_self.as_nonnull()] {
self->process_media_data(FetchingStatus::Interrupted);
});
});
VERIFY(response->body());
response->body()->incrementally_read(update_media, process_end_of_media, process_body_error, GC::Ref { global });
};
m_fetch_controller = Fetch::Fetching::fetch(realm, request, Fetch::Infrastructure::FetchAlgorithms::create(vm, move(fetch_algorithms_input)));
@@ -1555,7 +1565,35 @@ void HTMLMediaElement::process_media_data(FetchingStatus fetching_status)
}));
}
// FIXME: -> If the connection is interrupted after some media data has been received, causing the user agent to give up trying to fetch the resource
// -> If the connection is interrupted after some media data has been received, causing the user agent to give up trying
// to fetch the resource
if (fetching_status == FetchingStatus::Interrupted) {
// Fatal network errors that occur after the user agent has established whether the current media resource is usable
// (i.e. once the media element's readyState attribute is no longer HAVE_NOTHING) must cause the user agent to
// execute the following steps:
if (m_ready_state > ReadyState::HaveNothing) {
VERIFY(!m_error);
// 1. The user agent should cancel the fetching process.
cancel_the_fetching_process();
// 2. Set the error attribute to the result of creating a MediaError with MEDIA_ERR_NETWORK.
m_error = realm.create<MediaError>(realm, MediaError::Code::Network, "Connection interrupted"_string);
// 3. Set the element's networkState attribute to the NETWORK_IDLE value.
m_network_state = NetworkState::Idle;
// 4. Set the element's delaying-the-load-event flag to false. This stops delaying the load event.
m_delaying_the_load_event.clear();
// 5. Fire an event named error at the media element.
dispatch_event(DOM::Event::create(realm, HTML::EventNames::error));
// 6. Abort the overall resource selection algorithm.
// NB: Stopping the fetch stops the resource selection algorithm when the error is set.
}
}
// FIXME: -> If the media data fetching process is aborted by the user
// FIXME: -> If the media data can be fetched but has non-fatal errors or uses, in part, codecs that are unsupported, preventing the user agent from
// rendering the content completely correctly but not preventing playback altogether