diff options
Diffstat (limited to 'components/script/dom/bindings')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 4 | ||||
-rw-r--r-- | components/script/dom/bindings/guard.rs | 4 | ||||
-rw-r--r-- | components/script/dom/bindings/trace.rs | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 12510e25d7d..e6e95ab1cb8 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2249,7 +2249,7 @@ class CGConstructorEnabled(CGAbstractMethod): pref = iface.getExtendedAttribute("Pref") if pref: assert isinstance(pref, list) and len(pref) == 1 - conditions.append('prefs::get_pref("%s").as_boolean().unwrap_or(false)' % pref[0]) + conditions.append('PREFS.get("%s").as_boolean().unwrap_or(false)' % pref[0]) func = iface.getExtendedAttribute("Func") if func: assert isinstance(func, list) and len(func) == 1 @@ -5606,7 +5606,7 @@ class CGBindingRoot(CGThing): 'dom::browsingcontext::BrowsingContext', 'mem::heap_size_of_raw_self_and_children', 'libc', - 'util::prefs', + 'util::prefs::PREFS', 'script_runtime::{store_panic_result, maybe_take_panic_result}', 'std::borrow::ToOwned', 'std::cmp', diff --git a/components/script/dom/bindings/guard.rs b/components/script/dom/bindings/guard.rs index 40faebbd4f2..114045a62e8 100644 --- a/components/script/dom/bindings/guard.rs +++ b/components/script/dom/bindings/guard.rs @@ -5,7 +5,7 @@ //! Machinery to conditionally expose things. use js::jsapi::{HandleObject, JSContext}; -use util::prefs::get_pref; +use util::prefs::PREFS; /// A container with a condition. pub struct Guard<T: Clone + Copy> { @@ -47,7 +47,7 @@ pub enum Condition { impl Condition { unsafe fn is_satisfied(&self, cx: *mut JSContext, obj: HandleObject) -> bool { match *self { - Condition::Pref(name) => get_pref(name).as_boolean().unwrap_or(false), + Condition::Pref(name) => PREFS.get(name).as_boolean().unwrap_or(false), Condition::Func(f) => f(cx, obj), Condition::Satisfied => true, } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index aa9fa1b075d..d066db9dfcb 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -57,7 +57,7 @@ use js::jsval::JSVal; use js::rust::Runtime; use libc; use msg::constellation_msg::{FrameType, PipelineId, SubpageId, WindowSizeData, WindowSizeType, ReferrerPolicy}; -use net_traits::filemanager_thread::SelectedFileId; +use net_traits::filemanager_thread::{SelectedFileId, RelativePos}; use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread}; use net_traits::response::HttpsState; @@ -329,6 +329,7 @@ no_jsmanaged_fields!(ReferrerPolicy); no_jsmanaged_fields!(ResourceThreads); no_jsmanaged_fields!(SystemTime); no_jsmanaged_fields!(SelectedFileId); +no_jsmanaged_fields!(RelativePos); no_jsmanaged_fields!(OpaqueStyleAndLayoutData); no_jsmanaged_fields!(CSSErrorReporter); no_jsmanaged_fields!(WebGLBufferId); |