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

LibWeb: Make sure <script> elements get prepared when connected

Browse source 
There's a bit more nuance to how this should really work, but let's at
least make sure we execute <script> elements if you insert them into
the document.
This commit is contained in:
Andreas Kling 2021-03-15 19:41:15 +01:00
parent d434ae71b3
commit 8cafdf8985
2 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,7 +113,7 @@ static bool is_javascript_mime_type_essence_match(const String& string)
} }
// https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script // https://html.spec.whatwg.org/multipage/scripting.html#prepare-a-script
void HTMLScriptElement::prepare_script(Badge<HTMLDocumentParser>) void HTMLScriptElement::prepare_script()
{ {
if (m_already_started) { if (m_already_started) {
dbgln("HTMLScriptElement: Refusing to run script because it has already started."); dbgln("HTMLScriptElement: Refusing to run script because it has already started.");
@ -271,7 +271,23 @@ void HTMLScriptElement::prepare_script(Badge<HTMLDocumentParser>)
else if ((m_script_type == ScriptType::Classic && has_attribute(HTML::AttributeNames::src) && !has_attribute(HTML::AttributeNames::async) && !m_non_blocking) else if ((m_script_type == ScriptType::Classic && has_attribute(HTML::AttributeNames::src) && !has_attribute(HTML::AttributeNames::async) && !m_non_blocking)
|| (m_script_type == ScriptType::Module && !has_attribute(HTML::AttributeNames::async) && !m_non_blocking)) { || (m_script_type == ScriptType::Module && !has_attribute(HTML::AttributeNames::async) && !m_non_blocking)) {
TODO(); m_preparation_time_document->add_script_to_execute_as_soon_as_possible({}, *this);
// FIXME: When the script is ready, run the following steps:
//
// If the element is not now the first element in the list of scripts
// that will execute in order as soon as possible to which it was added above,
// then mark the element as ready but return without executing the script yet.
//
// Execution: Execute the script block corresponding to the first script element
// in this list of scripts that will execute in order as soon as possible.
//
// Remove the first element from this list of scripts that will execute in order
// as soon as possible.
//
// If this list of scripts that will execute in order as soon as possible is still
// not empty and the first entry has already been marked as ready, then jump back
// to the step labeled execution.
} }
else if ((m_script_type == ScriptType::Classic && has_attribute(HTML::AttributeNames::src)) || m_script_type == ScriptType::Module) { else if ((m_script_type == ScriptType::Classic && has_attribute(HTML::AttributeNames::src)) || m_script_type == ScriptType::Module) {
@ -313,4 +329,13 @@ void HTMLScriptElement::when_the_script_is_ready(Function<void()> callback)
m_script_ready_callback = move(callback); m_script_ready_callback = move(callback);
} }
void HTMLScriptElement::inserted_into(Node& parent)
{
// FIXME: It would be nice to have a notification for "node became connected"
if (is_connected()) {
prepare_script();
}
HTMLElement::inserted_into(parent);
}
} }

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

@ -45,10 +45,13 @@ public:
void set_parser_document(Badge<HTMLDocumentParser>, DOM::Document&); void set_parser_document(Badge<HTMLDocumentParser>, DOM::Document&);
void set_non_blocking(Badge<HTMLDocumentParser>, bool); void set_non_blocking(Badge<HTMLDocumentParser>, bool);
void set_already_started(Badge<HTMLDocumentParser>, bool b) { m_already_started = b; } void set_already_started(Badge<HTMLDocumentParser>, bool b) { m_already_started = b; }
void prepare_script(Badge<HTMLDocumentParser>); void prepare_script(Badge<HTMLDocumentParser>) { prepare_script(); }
void execute_script(); void execute_script();
virtual void inserted_into(Node&) override;
private: private:
void prepare_script();
void script_became_ready(); void script_became_ready();
void when_the_script_is_ready(Function<void()>); void when_the_script_is_ready(Function<void()>);