Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement the create an element for token algorithm #19397

Merged
merged 4 commits into from Jan 17, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Implement `throw-on-dynamic-markup-insertion-counter`

  • Loading branch information
cbrewster authored and jdm committed Jan 11, 2018
commit 4593195b493e819b56b8f34376b1058a80210c53
@@ -364,6 +364,8 @@ pub struct Document {
tti_window: DomRefCell<InteractiveWindow>,
/// RAII canceller for Fetch
canceller: FetchCanceller,
/// https://html.spec.whatwg.org/multipage/#throw-on-dynamic-markup-insertion-counter
throw_on_dynamic_markup_insertion_counter: Cell<u64>,
}

#[derive(JSTraceable, MallocSizeOf)]
@@ -2053,6 +2055,16 @@ impl Document {
let global_scope = self.window.upcast::<GlobalScope>();
global_scope.script_to_constellation_chan().send(msg).unwrap();
}

pub fn increment_throw_on_dynamic_markup_insertion_counter(&self) {
let counter = self.throw_on_dynamic_markup_insertion_counter.get();
self.throw_on_dynamic_markup_insertion_counter.set(counter + 1);
}

pub fn decrement_throw_on_dynamic_markup_insertion_counter(&self) {
let counter = self.throw_on_dynamic_markup_insertion_counter.get();
self.throw_on_dynamic_markup_insertion_counter.set(counter - 1);
}
}

#[derive(MallocSizeOf, PartialEq)]
@@ -2294,6 +2306,7 @@ impl Document {
interactive_time: DomRefCell::new(interactive_time),
tti_window: DomRefCell::new(InteractiveWindow::new()),
canceller: canceller,
throw_on_dynamic_markup_insertion_counter: Cell::new(0),
}
}

@@ -3717,7 +3730,9 @@ impl DocumentMethods for Document {
}

// Step 2.
// TODO: handle throw-on-dynamic-markup-insertion counter.
if self.throw_on_dynamic_markup_insertion_counter.get() > 0 {
return Err(Error::InvalidState);
}

if !self.is_active() {
// Step 3.
@@ -3863,7 +3878,10 @@ impl DocumentMethods for Document {
}

// Step 2.
// TODO: handle throw-on-dynamic-markup-insertion counter.
if self.throw_on_dynamic_markup_insertion_counter.get() > 0 {
return Err(Error::InvalidState);
}

if !self.is_active() {
// Step 3.
return Ok(());
@@ -3910,7 +3928,9 @@ impl DocumentMethods for Document {
}

// Step 2.
// TODO: handle throw-on-dynamic-markup-insertion counter.
if self.throw_on_dynamic_markup_insertion_counter.get() > 0 {
return Err(Error::InvalidState);
}

let parser = match self.get_current_parser() {
Some(ref parser) if parser.is_script_created() => DomRoot::from_ref(&**parser),
@@ -1000,7 +1000,7 @@ fn create_element_for_token(
// Step 6.
if will_execute_script {
// Step 6.1.
// TODO: handle throw-on-dynamic-markup-insertion counter.
document.increment_throw_on_dynamic_markup_insertion_counter();
// Step 6.2
if is_execution_stack_empty() {
document.window().upcast::<GlobalScope>().perform_a_microtask_checkpoint();
@@ -1025,9 +1025,9 @@ fn create_element_for_token(
// Step 9.
if will_execute_script {
// Steps 9.1 - 9.2.
ScriptThread::pop_current_element_queue()
ScriptThread::pop_current_element_queue();
// Step 9.3.
// TODO: handle throw-on-dynamic-markup-insertion counter.
document.decrement_throw_on_dynamic_markup_insertion_counter();
}

// TODO: Step 10.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.