RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:18:11 +00:00
Code Issues Activity Actions

LibWeb: Provide file name to JavaScript interpreter

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-02-27 19:35:45 +01:00 • committed by Andreas Kling
parent 6172cb3599
commit 8dca96fb61
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -546,9 +546,9 @@ JS::Interpreter& Document::interpreter()
return *m_interpreter; return *m_interpreter;
} }
JS::Value Document::run_javascript(const StringView& source) JS::Value Document::run_javascript(const StringView& source, const StringView& filename)
{ {
auto parser = JS::Parser(JS::Lexer(source)); auto parser = JS::Parser(JS::Lexer(source, filename));
auto program = parser.parse_program(); auto program = parser.parse_program();
if (parser.has_errors()) { if (parser.has_errors()) {
parser.print_errors(); parser.print_errors();

2
Userland/Libraries/LibWeb/DOM/Document.h
View file

@ -157,7 +157,7 @@ public:
virtual JS::Interpreter& interpreter() override; virtual JS::Interpreter& interpreter() override;
JS::Value run_javascript(const StringView&); JS::Value run_javascript(const StringView& source, const StringView& filename = "(unknown)");
NonnullRefPtr<Element> create_element(const String& tag_name); NonnullRefPtr<Element> create_element(const String& tag_name);
NonnullRefPtr<Element> create_element_ns(const String& namespace_, const String& qualifed_name); NonnullRefPtr<Element> create_element_ns(const String& namespace_, const String& qualifed_name);

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

@ -40,6 +40,7 @@ namespace Web::HTML {
HTMLScriptElement::HTMLScriptElement(DOM::Document& document, QualifiedName qualified_name) HTMLScriptElement::HTMLScriptElement(DOM::Document& document, QualifiedName qualified_name)
: HTMLElement(document, move(qualified_name)) : HTMLElement(document, move(qualified_name))
, m_script_filename("(document)")
{ {
} }
@ -89,7 +90,7 @@ void HTMLScriptElement::execute_script()
else else
dbgln_if(HTML_SCRIPT_DEBUG, "HTMLScriptElement: Running inline script"); dbgln_if(HTML_SCRIPT_DEBUG, "HTMLScriptElement: Running inline script");
document().run_javascript(m_script_source); document().run_javascript(m_script_source, m_script_filename);
document().set_current_script({}, old_current_script); document().set_current_script({}, old_current_script);
} else { } else {
@ -229,6 +230,7 @@ void HTMLScriptElement::prepare_script(Badge<HTMLDocumentParser>)
if (m_script_type == ScriptType::Classic) { if (m_script_type == ScriptType::Classic) {
// FIXME: This load should be made asynchronous and the parser should spin an event loop etc. // FIXME: This load should be made asynchronous and the parser should spin an event loop etc.
m_script_filename = url.basename();
ResourceLoader::the().load_sync( ResourceLoader::the().load_sync(
url, url,
[this, url](auto data, auto&) { [this, url](auto data, auto&) {

1
Userland/Libraries/LibWeb/HTML/HTMLScriptElement.h
View file

@ -72,6 +72,7 @@ private:
Function<void()> m_script_ready_callback; Function<void()> m_script_ready_callback;
String m_script_source; String m_script_source;
String m_script_filename;
}; };
} }