From f87c2a8d7616112ca924e30292db2d244cf87eec Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 26 Sep 2017 01:53:40 +0200 Subject: Rename Root to DomRoot In a later PR, DomRoot will become a type alias of Root>, where Root will be able to handle all the things that need to be rooted that have a stable traceable address that doesn't move for the whole lifetime of the root. Stay tuned. --- components/script/dom/permissions.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/dom/permissions.rs') diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index 1ff8fc301b7..74fc675008e 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::PermissionStatusBinding::PermissionStatusM use dom::bindings::codegen::Bindings::PermissionsBinding::{self, PermissionsMethods}; use dom::bindings::error::Error; use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; -use dom::bindings::root::Root; +use dom::bindings::root::DomRoot; use dom::bluetooth::Bluetooth; use dom::bluetoothpermissionresult::BluetoothPermissionResult; use dom::globalscope::GlobalScope; @@ -63,7 +63,7 @@ impl Permissions { } } - pub fn new(global: &GlobalScope) -> Root { + pub fn new(global: &GlobalScope) -> DomRoot { reflect_dom_object(box Permissions::new_inherited(), global, PermissionsBinding::Wrap) @@ -265,7 +265,7 @@ pub fn get_descriptor_permission_state(permission_name: PermissionName, -> PermissionState { // Step 1. let settings = match env_settings_obj { - Some(env_settings_obj) => Root::from_ref(env_settings_obj), + Some(env_settings_obj) => DomRoot::from_ref(env_settings_obj), None => GlobalScope::current().expect("No current global object"), }; -- cgit v1.2.3