Skip to content

Commit

Permalink
Fix Servo build.
Browse files Browse the repository at this point in the history
  • Loading branch information
emilio committed Sep 18, 2018
1 parent 5ab81c4 commit 60e28c6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
8 changes: 6 additions & 2 deletions components/layout_thread/dom_wrapper.rs
Expand Up @@ -685,7 +685,9 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
type Impl = SelectorImpl;

fn opaque(&self) -> ::selectors::OpaqueElement {
::selectors::OpaqueElement::new(self.as_node().opaque().0 as *const ())
::selectors::OpaqueElement::new(unsafe {
&*(self.as_node().opaque().0 as *const ())
})
}

fn parent_element(&self) -> Option<ServoLayoutElement<'le>> {
Expand Down Expand Up @@ -1258,7 +1260,9 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
type Impl = SelectorImpl;

fn opaque(&self) -> ::selectors::OpaqueElement {
::selectors::OpaqueElement::new(self.as_node().opaque().0 as *const ())
::selectors::OpaqueElement::new(unsafe {
&*(self.as_node().opaque().0 as *const ())
})
}

fn parent_element(&self) -> Option<Self> {
Expand Down
5 changes: 4 additions & 1 deletion components/script/dom/element.rs
Expand Up @@ -2616,8 +2616,11 @@ impl VirtualMethods for Element {
impl<'a> SelectorsElement for DomRoot<Element> {
type Impl = SelectorImpl;

#[allow(unsafe_code)]
fn opaque(&self) -> ::selectors::OpaqueElement {
::selectors::OpaqueElement::new(self.reflector().get_jsobject().get())
::selectors::OpaqueElement::new(unsafe {
&*self.reflector().get_jsobject().get()
})
}

fn parent_element(&self) -> Option<DomRoot<Element>> {
Expand Down

0 comments on commit 60e28c6

Please sign in to comment.