dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWeb: Use one method to cancel media elements' fetches

Browse source 
This should help avoid the footgun of forgetting to check for null on
m_fetch_controller. We had missed this check when firing off an error
due to an unsupported format in the PlaybackManager, so we could call
stop_fetch() on a null pointer if the download had completed already.
This commit is contained in:
Zaggy1024 2026-02-19 14:56:13 -06:00 committed by Gregory Bertilson
parent c1c51079a8
commit d9eafc8edc
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibWeb/HTML/HTMLMediaElement.cpp
View file

@ -140,6 +140,12 @@ void HTMLMediaElement::removed_from(DOM::Node* old_parent, DOM::Node& old_root)
pause_element();
}
void HTMLMediaElement::cancel_the_fetching_process()
{
if (m_fetch_controller)
m_fetch_controller->stop_fetch();
}
// https://html.spec.whatwg.org/multipage/media.html#fatal-decode-error
void HTMLMediaElement::set_decoder_error(String error_message)
{
@ -153,8 +159,7 @@ void HTMLMediaElement::set_decoder_error(String error_message)
return;
// 1. The user agent should cancel the fetching process.
if (m_fetch_controller)
m_fetch_controller->stop_fetch();
cancel_the_fetching_process();
// 2. Set the error attribute to the result of creating a MediaError with MEDIA_ERR_DECODE.
m_error = realm.create<MediaError>(realm, MediaError::Code::Decode, move(error_message));
@ -571,8 +576,7 @@ WebIDL::ExceptionOr<void> HTMLMediaElement::load_element()
});
// 2. If a fetching process is in progress for the media element, the user agent should stop it.
if (m_fetch_controller && m_fetch_controller->state() == Fetch::Infrastructure::FetchController::State::Ongoing)
m_fetch_controller->stop_fetch();
cancel_the_fetching_process();
// FIXME: 3. If the media element's assigned media provider object is a MediaSource object, then detach it.
@ -1225,8 +1229,7 @@ void HTMLMediaElement::restart_fetch_at_offset(FetchData& fetch_data, u64 offset
{
if (!fetch_data.accepts_byte_ranges)
return;
if (m_fetch_controller && m_fetch_controller->state() == Fetch::Infrastructure::FetchController::State::Ongoing)
m_fetch_controller->stop_fetch();
cancel_the_fetching_process();
fetch_resource(fetch_data, UntilEnd { offset });
}
@ -1525,7 +1528,7 @@ void HTMLMediaElement::set_up_playback_manager(NonnullRefPtr<FetchData> const& f
return;
// 1. The user agent should cancel the fetching process.
weak_self->m_fetch_controller->stop_fetch();
weak_self->cancel_the_fetching_process();
// 2. Abort this subalgorithm, returning to the resource selection algorithm.
fetch_data->failure_callback(MUST(String::from_utf8(error.description())));

2
Libraries/LibWeb/HTML/HTMLMediaElement.h
View file

@ -47,6 +47,8 @@ public:
// NOTE: The function is wrapped in a GC::HeapFunction immediately.
void queue_a_media_element_task(Function<void()>);
void cancel_the_fetching_process();
GC::Ptr<MediaError> error() const { return m_error; }
void set_decoder_error(String error_message);