mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-05-05 18:52:56 +00:00
LibJS: Consolidate error messages into ErrorTypes.h
Now, exceptions can be thrown with interpreter.throw_exception<T>(ErrorType:TYPE, "format", "args", "here").
This commit is contained in:
parent
9940a7f6de
commit
78155a6668
Notes:
sideshowbarker
2024-07-19 05:43:14 +09:00
Author: https://github.com/mattco98
Commit: 78155a6668
Pull-request: https://github.com/SerenityOS/serenity/pull/2538
Issue: https://github.com/SerenityOS/serenity/issues/1842
63 changed files with 439 additions and 223 deletions
|
@ -137,12 +137,12 @@ JS::Value CanvasRenderingContext2DWrapper::draw_image(JS::Interpreter& interpret
|
|||
if (!impl)
|
||||
return {};
|
||||
if (interpreter.argument_count() < 3)
|
||||
return interpreter.throw_exception<JS::TypeError>("drawImage() needs three arguments");
|
||||
return interpreter.throw_exception<JS::TypeError>(JS::ErrorType::DrawImageArgumentCount);
|
||||
auto* image_argument = interpreter.argument(0).to_object(interpreter);
|
||||
if (!image_argument)
|
||||
return {};
|
||||
if (StringView(image_argument->class_name()) != "HTMLImageElementWrapper")
|
||||
return interpreter.throw_exception<JS::TypeError>(String::format("Image is not an HTMLImageElement, it's an %s", image_argument->class_name()));
|
||||
return interpreter.throw_exception<JS::TypeError>(JS::ErrorType::ImageIsAn, image_argument->class_name());
|
||||
|
||||
auto x = interpreter.argument(1).to_double(interpreter);
|
||||
if (interpreter.exception())
|
||||
|
@ -288,10 +288,10 @@ JS::Value CanvasRenderingContext2DWrapper::fill(JS::Interpreter& interpreter)
|
|||
if (winding_name == "evenodd") {
|
||||
winding = Gfx::Painter::WindingRule::EvenOdd;
|
||||
} else if (winding_name != "nonzero") {
|
||||
return interpreter.throw_exception<JS::TypeError>("fill winding rule must be either 'nonzero' or 'evenodd'");
|
||||
return interpreter.throw_exception<JS::TypeError>(JS::ErrorType::FillBadWindingRule);
|
||||
}
|
||||
} else {
|
||||
return interpreter.throw_exception<JS::TypeError>("fill called with non-string");
|
||||
return interpreter.throw_exception<JS::TypeError>(JS::ErrorType::FillNonString);
|
||||
}
|
||||
} else {
|
||||
// FIXME: Path2D object
|
||||
|
@ -378,7 +378,7 @@ JS::Value CanvasRenderingContext2DWrapper::put_image_data(JS::Interpreter& inter
|
|||
return {};
|
||||
|
||||
if (StringView(image_data_object->class_name()) != "ImageDataWrapper") {
|
||||
return interpreter.throw_exception<JS::TypeError>("putImageData called with non-ImageData");
|
||||
return interpreter.throw_exception<JS::TypeError>(JS::ErrorType::PutImageDataBadCall);
|
||||
}
|
||||
|
||||
auto& image_data = static_cast<ImageDataWrapper*>(image_data_object)->impl();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue