Introduce LayoutJS<Node>::opaque() to replace OpaqueNodeMethods::from_jsmanaged().

1 files changed, 1 insertions, 15 deletions

diff --git a/components/layout/opaque_node.rs b/components/layout/opaque_node.rs
index db80d45fe1d..41a4ccd5617 100644
--- a/components/layout/opaque_node.rs
+++ b/components/layout/opaque_node.rs
@@ -2,31 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![allow(unsafe_code)]
-
 use gfx::display_list::OpaqueNode;
-use libc::{c_void, uintptr_t};
-use script::layout_interface::LayoutJS;
-use script::layout_interface::Node;
+use libc::c_void;
 use script_traits::UntrustedNodeAddress;
 
 pub trait OpaqueNodeMethods {
-    /// Converts a DOM node to an `OpaqueNode'.
-    fn from_jsmanaged(node: &LayoutJS<Node>) -> Self;
-
     /// Converts this node to an `UntrustedNodeAddress`. An `UntrustedNodeAddress` is just the type
     /// of node that script expects to receive in a hit test.
     fn to_untrusted_node_address(&self) -> UntrustedNodeAddress;
 }
 
 impl OpaqueNodeMethods for OpaqueNode {
-    fn from_jsmanaged(node: &LayoutJS<Node>) -> OpaqueNode {
-        unsafe {
-            let ptr: uintptr_t = node.get_jsobject() as uintptr_t;
-            OpaqueNode(ptr)
-        }
-    }
-
     fn to_untrusted_node_address(&self) -> UntrustedNodeAddress {
         UntrustedNodeAddress(self.0 as *const c_void)
     }