aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/node.rs
diff options
context:
space:
mode:
authorChris Double <chris.double@double.co.nz>2015-03-12 19:06:07 +1300
committerChris Double <chris.double@double.co.nz>2015-03-12 19:15:12 +1300
commit2af19b26758ee1344f72ade4eee802ca7d4bb925 (patch)
tree1a917308580661af306dd4b133ee0a236b9abf58 /components/script/dom/node.rs
parent7b6e314df1b93bd749eee9036927d795f26e1590 (diff)
downloadservo-2af19b26758ee1344f72ade4eee802ca7d4bb925.tar.gz
servo-2af19b26758ee1344f72ade4eee802ca7d4bb925.zip
Fix #2108 by renaming unwrap functions to native_from_reflector
As noted by @bholley. "unwrap" is confusing because we are both stripping off wrappers *and* getting a native from a reflector. Changing the "unwrap" usage to "native_from_reflector" for clarity. This renames 'unwrap' to 'native_from_reflector' and 'unwrap_jsmanaged' to 'native_from_reflector_jsmanaged'.
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r--components/script/dom/node.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index cd9dc6e6098..1ce9cfeae9e 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -913,7 +913,7 @@ pub fn from_untrusted_node_address(runtime: *mut JSRuntime, candidate: Untrusted
if object.is_null() {
panic!("Attempted to create a `JS<Node>` from an invalid pointer!")
}
- let boxed_node: *const Node = conversions::unwrap(object);
+ let boxed_node: *const Node = conversions::native_from_reflector(object);
Temporary::from_unrooted(Unrooted::from_raw(boxed_node))
}
}