diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp index b43439153c..50d3a89567 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.cpp @@ -4,18 +4,65 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include namespace Web::HTML { -NonnullRefPtr ClassicScript::create(URL base_url, RefPtr script_record) +// https://html.spec.whatwg.org/multipage/webappapis.html#creating-a-classic-script +NonnullRefPtr ClassicScript::create(StringView source, JS::GlobalObject& global_object, URL base_url, MutedErrors muted_errors) { - return adopt_ref(*new ClassicScript(move(base_url), move(script_record))); + // 1. If muted errors was not provided, let it be false. (NOTE: This is taken care of by the default argument.) + + // 2. If muted errors is true, then set baseURL to about:blank. + if (muted_errors == MutedErrors::Yes) + base_url = "about:blank"; + + // FIXME: 3. If scripting is disabled for settings, then set source to the empty string. + + // 4. Let script be a new classic script that this algorithm will subsequently initialize. + auto script = adopt_ref(*new ClassicScript(move(base_url))); + + // FIXME: 5. Set script's settings object to settings. + + // 6. Set script's base URL to baseURL. (NOTE: This was already done when constructing.) + + // FIXME: 7. Set script's fetch options to options. + + // 8. Set script's muted errors to muted errors. + script->m_muted_errors = muted_errors; + + // FIXME: 9. Set script's parse error and error to rethrow to null. + + // 10. Let result be ParseScript(source, settings's Realm, script). + auto result = JS::Script::parse(source, global_object); + + // FIXME: 11. If result is a list of errors, then: + // 1. Set script's parse error and its error to rethrow to result[0]. + // 2. Return script. + + // 12. Set script's record to result. + script->m_script_record = move(result); + + // 13. Return script. + return script; } -ClassicScript::ClassicScript(URL base_url, RefPtr script_record) +// https://html.spec.whatwg.org/multipage/webappapis.html#run-a-classic-script +JS::Value ClassicScript::run(RethrowErrors rethrow_errors) +{ + (void)rethrow_errors; + + auto interpreter = JS::Interpreter::create_with_existing_global_object(m_script_record->global_object()); + interpreter->run(interpreter->global_object(), m_script_record->parse_node()); + auto& vm = interpreter->vm(); + if (vm.exception()) + vm.clear_exception(); + return vm.last_value(); +} + +ClassicScript::ClassicScript(URL base_url) : Script(move(base_url)) - , m_script_record(move(script_record)) { } diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.h b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.h index 2959b308fc..2642c00bca 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ClassicScript.h @@ -15,15 +15,27 @@ namespace Web::HTML { class ClassicScript final : public Script { public: ~ClassicScript(); - static NonnullRefPtr create(URL base_url, RefPtr); + + enum class MutedErrors { + No, + Yes, + }; + static NonnullRefPtr create(StringView source, JS::GlobalObject&, URL base_url, MutedErrors = MutedErrors::No); JS::Script* script_record() { return m_script_record; } JS::Script const* script_record() const { return m_script_record; } + enum class RethrowErrors { + No, + Yes, + }; + JS::Value run(RethrowErrors = RethrowErrors::No); + private: - explicit ClassicScript(URL base_url, RefPtr); + explicit ClassicScript(URL base_url); RefPtr m_script_record; + MutedErrors m_muted_errors { MutedErrors::No }; }; }