system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 08:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Remove OOM error propagation from HTMLMediaElement (and friends)

Browse source
This commit is contained in:
Timothy Flynn 2024-04-26 11:56:11 -04:00 committed by Tim Flynn
parent dd16ea87c3
commit 13422b5116
7 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/HTML/AudioTrackList.cpp
View file

@ -44,12 +44,10 @@ JS::ThrowCompletionOr<Optional<JS::PropertyDescriptor>> AudioTrackList::internal
return Base::internal_get_own_property(property_name);
}
ErrorOr<void> AudioTrackList::add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<AudioTrack> audio_track)
void AudioTrackList::add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<AudioTrack> audio_track)
{
TRY(m_audio_tracks.try_append(audio_track));
m_audio_tracks.append(audio_track);
audio_track->set_audio_track_list({}, this);
return {};
}
void AudioTrackList::remove_all_tracks(Badge<HTMLMediaElement>)

2
Userland/Libraries/LibWeb/HTML/AudioTrackList.h
View file

@ -19,7 +19,7 @@ class AudioTrackList final : public DOM::EventTarget {
JS_DECLARE_ALLOCATOR(AudioTrackList);
public:
ErrorOr<void> add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<AudioTrack>);
void add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<AudioTrack>);
void remove_all_tracks(Badge<HTMLMediaElement>);
// https://html.spec.whatwg.org/multipage/media.html#dom-audiotracklist-length

15
Userland/Libraries/LibWeb/HTML/HTMLMediaElement.cpp
View file

@ -172,10 +172,8 @@ JS::NonnullGCPtr<TimeRanges> HTMLMediaElement::buffered() const
}
// https://html.spec.whatwg.org/multipage/media.html#dom-navigator-canplaytype
WebIDL::ExceptionOr<Bindings::CanPlayTypeResult> HTMLMediaElement::can_play_type(StringView type) const
Bindings::CanPlayTypeResult HTMLMediaElement::can_play_type(StringView type) const
{
auto& vm = this->vm();
// The canPlayType(type) method must:
// - return the empty string if type is a type that the user agent knows it cannot render or is the type "application/octet-stream"
// - return "probably" if the user agent is confident that the type represents a media resource that it can render if used in with this audio or video element
@ -184,7 +182,7 @@ WebIDL::ExceptionOr<Bindings::CanPlayTypeResult> HTMLMediaElement::can_play_type
if (type == "application/octet-stream"sv)
return Bindings::CanPlayTypeResult::Empty;
auto mime_type = TRY_OR_THROW_OOM(vm, MimeSniff::MimeType::parse(type));
auto mime_type = MUST(MimeSniff::MimeType::parse(type));
if (mime_type.has_value() && mime_type->type() == "video"sv) {
if (mime_type->subtype() == "webm"sv)
@ -341,7 +339,6 @@ void HTMLMediaElement::set_duration(double duration)
WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> HTMLMediaElement::play()
{
auto& realm = this->realm();
auto& vm = realm.vm();
// FIXME: 1. If the media element is not allowed to play, then return a promise rejected with a "NotAllowedError" DOMException.
@ -354,7 +351,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::Promise>> HTMLMediaElement::play()
// 3. Let promise be a new promise and append promise to the list of pending play promises.
auto promise = WebIDL::create_promise(realm);
TRY_OR_THROW_OOM(vm, m_pending_play_promises.try_append(promise));
m_pending_play_promises.append(promise);
// 4. Run the internal play steps for the media element.
TRY(play_element());
@ -1080,7 +1077,7 @@ WebIDL::ExceptionOr<void> HTMLMediaElement::process_media_data(Function<void(Str
m_fetch_controller->stop_fetch();
// 2. Abort this subalgorithm, returning to the resource selection algorithm.
failure_callback(TRY_OR_THROW_OOM(vm, String::from_utf8(playback_manager.error().description())));
failure_callback(MUST(String::from_utf8(playback_manager.error().description())));
return {};
}
@ -1094,7 +1091,7 @@ WebIDL::ExceptionOr<void> HTMLMediaElement::process_media_data(Function<void(Str
audio_track = vm.heap().allocate<AudioTrack>(realm, realm, *this, audio_loader.release_value());
// 2. Update the media element's audioTracks attribute's AudioTrackList object with the new AudioTrack object.
TRY_OR_THROW_OOM(vm, m_audio_tracks->add_track({}, *audio_track));
m_audio_tracks->add_track({}, *audio_track);
// 3. Let enable be unknown.
auto enable = TriState::Unknown;
@ -1126,7 +1123,7 @@ WebIDL::ExceptionOr<void> HTMLMediaElement::process_media_data(Function<void(Str
video_track = vm.heap().allocate<VideoTrack>(realm, realm, *this, playback_manager.release_value());
// 2. Update the media element's videoTracks attribute's VideoTrackList object with the new VideoTrack object.
TRY_OR_THROW_OOM(vm, m_video_tracks->add_track({}, *video_track));
m_video_tracks->add_track({}, *video_track);
// 3. Let enable be unknown.
auto enable = TriState::Unknown;

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

@ -59,7 +59,7 @@ public:
[[nodiscard]] JS::NonnullGCPtr<TimeRanges> buffered() const;
WebIDL::ExceptionOr<Bindings::CanPlayTypeResult> can_play_type(StringView type) const;
Bindings::CanPlayTypeResult can_play_type(StringView type) const;
enum class ReadyState : u16 {
HaveNothing,

4
Userland/Libraries/LibWeb/HTML/VideoTrack.cpp
View file

@ -54,12 +54,12 @@ VideoTrack::VideoTrack(JS::Realm& realm, JS::NonnullGCPtr<HTMLMediaElement> medi
};
m_playback_manager->on_decoder_error = [this](auto error) {
auto error_message = String::from_utf8(error.description()).release_value_but_fixme_should_propagate_errors();
auto error_message = MUST(String::from_utf8(error.description()));
m_media_element->set_decoder_error(move(error_message));
};
m_playback_manager->on_fatal_playback_error = [this](auto error) {
auto error_message = String::from_utf8(error.string_literal()).release_value_but_fixme_should_propagate_errors();
auto error_message = MUST(String::from_utf8(error.string_literal()));
m_media_element->set_decoder_error(move(error_message));
};
}

6
Userland/Libraries/LibWeb/HTML/VideoTrackList.cpp
View file

@ -44,12 +44,10 @@ JS::ThrowCompletionOr<Optional<JS::PropertyDescriptor>> VideoTrackList::internal
return Base::internal_get_own_property(property_name);
}
ErrorOr<void> VideoTrackList::add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<VideoTrack> video_track)
void VideoTrackList::add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<VideoTrack> video_track)
{
TRY(m_video_tracks.try_append(video_track));
m_video_tracks.append(video_track);
video_track->set_video_track_list({}, this);
return {};
}
void VideoTrackList::remove_all_tracks(Badge<HTMLMediaElement>)

2
Userland/Libraries/LibWeb/HTML/VideoTrackList.h
View file

@ -19,7 +19,7 @@ class VideoTrackList final : public DOM::EventTarget {
JS_DECLARE_ALLOCATOR(VideoTrackList);
public:
ErrorOr<void> add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<VideoTrack>);
void add_track(Badge<HTMLMediaElement>, JS::NonnullGCPtr<VideoTrack>);
void remove_all_tracks(Badge<HTMLMediaElement>);
Span<JS::NonnullGCPtr<VideoTrack>> video_tracks() { return m_video_tracks; }