RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:07:35 +00:00
Code Issues Activity Actions

LibWeb: Use TRY in DOMMatrix and DOMPointReadOnly

Browse source
This commit is contained in:
Bastiaan van der Plaat 2023-09-09 21:59:09 +02:00 • committed by Andrew Kaster
parent 8e7d3a6acc
commit 7e9ea964a8
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibWeb/Geometry/DOMMatrix.cpp
View file

@ -258,10 +258,7 @@ void DOMMatrix::set_f(double value)
WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMMatrix>> DOMMatrix::multiply_self(DOMMatrixInit other) WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMMatrix>> DOMMatrix::multiply_self(DOMMatrixInit other)
{ {
// 1. Let otherObject be the result of invoking create a DOMMatrix from the dictionary other. // 1. Let otherObject be the result of invoking create a DOMMatrix from the dictionary other.
auto maybe_other_object = DOMMatrix::create_from_dom_matrix_2d_init(realm(), other); auto other_object = TRY(DOMMatrix::create_from_dom_matrix_2d_init(realm(), other));
if (maybe_other_object.is_exception())
return maybe_other_object.exception();
auto other_object = maybe_other_object.release_value();
// 2. The otherObject matrix gets post-multiplied to the current matrix. // 2. The otherObject matrix gets post-multiplied to the current matrix.
m_matrix = m_matrix * other_object->m_matrix; m_matrix = m_matrix * other_object->m_matrix;
@ -278,10 +275,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMMatrix>> DOMMatrix::multiply_self(DOMMat
WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMMatrix>> DOMMatrix::pre_multiply_self(DOMMatrixInit other) WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMMatrix>> DOMMatrix::pre_multiply_self(DOMMatrixInit other)
{ {
// 1. Let otherObject be the result of invoking create a DOMMatrix from the dictionary other. // 1. Let otherObject be the result of invoking create a DOMMatrix from the dictionary other.
auto maybe_other_object = DOMMatrix::create_from_dom_matrix_2d_init(realm(), other); auto other_object = TRY(DOMMatrix::create_from_dom_matrix_2d_init(realm(), other));
if (maybe_other_object.is_exception())
return maybe_other_object.exception();
auto other_object = maybe_other_object.release_value();
// 2. The otherObject matrix gets pre-multiplied to the current matrix. // 2. The otherObject matrix gets pre-multiplied to the current matrix.
m_matrix = other_object->m_matrix * m_matrix; m_matrix = other_object->m_matrix * m_matrix;

5
Userland/Libraries/LibWeb/Geometry/DOMPointReadOnly.cpp
View file

@ -39,10 +39,7 @@ DOMPointReadOnly::~DOMPointReadOnly() = default;
WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMPoint>> DOMPointReadOnly::matrix_transform(DOMMatrixInit& matrix) const WebIDL::ExceptionOr<JS::NonnullGCPtr<DOMPoint>> DOMPointReadOnly::matrix_transform(DOMMatrixInit& matrix) const
{ {
// 1. Let matrixObject be the result of invoking create a DOMMatrix from the dictionary matrix. // 1. Let matrixObject be the result of invoking create a DOMMatrix from the dictionary matrix.
auto maybe_matrix_object = DOMMatrix::create_from_dom_matrix_2d_init(realm(), matrix); auto matrix_object = TRY(DOMMatrix::create_from_dom_matrix_2d_init(realm(), matrix));
if (maybe_matrix_object.is_exception())
return maybe_matrix_object.exception();
auto matrix_object = maybe_matrix_object.release_value();
// 2. Return the result of invoking transform a point with a matrix, given the current point and matrixObject. The current point does not get modified. // 2. Return the result of invoking transform a point with a matrix, given the current point and matrixObject. The current point does not get modified.
return matrix_object->transform_point(*this); return matrix_object->transform_point(*this);