auto merge of #1637 : Ms2ger/servo/get_rootable, r=pcwalton

This commit is contained in:
bors-servo 2014-02-08 09:52:42 -05:00
commit 77f52c705d

View file

@ -11,7 +11,7 @@ use std::cast;
use std::hashmap::HashMap;
use std::libc;
use std::ptr;
use std::ptr::{null, to_unsafe_ptr};
use std::ptr::null;
use std::str;
use std::vec;
use std::unstable::raw::Box;
@ -631,10 +631,6 @@ impl Reflector {
self.object = object;
}
pub fn get_rootable(&self) -> **JSObject {
return to_unsafe_ptr(&self.object);
}
pub fn new() -> Reflector {
Reflector {
object: ptr::null()