From 83adc7b769902a56935f84450ab891c03f0efc3e Mon Sep 17 00:00:00 2001 From: olmanz Date: Thu, 16 Nov 2017 19:14:12 +0100 Subject: [PATCH] Moved pop_current_element_queue() and push_new_element_queue() to htmlconstructor.rs --- components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- components/script/dom/bindings/htmlconstructor.rs | 9 +++++++++ components/script/dom/bindings/interface.rs | 9 --------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 8d91f84a6e4..a0b73b40985 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -5719,8 +5719,8 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries 'dom::bindings::interface::define_guarded_properties', 'dom::bindings::htmlconstructor::html_constructor', 'dom::bindings::interface::is_exposed_in', - 'dom::bindings::interface::pop_current_element_queue', - 'dom::bindings::interface::push_new_element_queue', + 'dom::bindings::htmlconstructor::pop_current_element_queue', + 'dom::bindings::htmlconstructor::push_new_element_queue', 'dom::bindings::iterable::Iterable', 'dom::bindings::iterable::IteratorType', 'dom::bindings::namespace::NamespaceObjectClass', diff --git a/components/script/dom/bindings/htmlconstructor.rs b/components/script/dom/bindings/htmlconstructor.rs index b376ad1941b..65d9f23f3c1 100644 --- a/components/script/dom/bindings/htmlconstructor.rs +++ b/components/script/dom/bindings/htmlconstructor.rs @@ -80,6 +80,7 @@ use js::jsapi::HandleObject; use js::jsapi::{CallArgs, CurrentGlobalOrNull}; use js::jsapi::{JSAutoCompartment, JSContext}; use js::jsapi::MutableHandleObject; +use script_thread::ScriptThread; use std::ptr; // https://html.spec.whatwg.org/multipage/#htmlconstructor @@ -311,3 +312,11 @@ pub fn get_constructor_object_from_local_name(name: LocalName, _ => false, } } + +pub fn pop_current_element_queue() { + ScriptThread::pop_current_element_queue(); +} + +pub fn push_new_element_queue() { + ScriptThread::push_new_element_queue(); +} diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index a6489291849..7492cc9464e 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -28,7 +28,6 @@ use js::jsapi::{TrueHandleValue, Value}; use js::jsval::{JSVal, PrivateValue}; use js::rust::{define_methods, define_properties, get_object_class}; use libc; -use script_thread::ScriptThread; use std::ptr; /// The class of a non-callback interface object. @@ -159,14 +158,6 @@ pub unsafe fn create_global_object( JS_FireOnNewGlobalObject(cx, rval.handle()); } -pub fn push_new_element_queue() { - ScriptThread::push_new_element_queue(); -} - -pub fn pop_current_element_queue() { - ScriptThread::pop_current_element_queue(); -} - /// Create and define the interface object of a callback interface. pub unsafe fn create_callback_interface_object( cx: *mut JSContext,