From 1305ac4dd0e6764ac929c0e9303fb50ce291df74 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Fri, 28 Nov 2014 06:05:45 +0900 Subject: [PATCH] Remove Element.node(). --- components/layout/wrapper.rs | 10 +++++----- components/script/dom/element.rs | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index 4f774041979..11ef5b66822 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -39,7 +39,7 @@ use util::{PrivateLayoutData}; use gfx::display_list::OpaqueNode; use script::dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementCast}; use script::dom::bindings::codegen::InheritTypes::{HTMLImageElementCast, HTMLInputElementCast}; -use script::dom::bindings::codegen::InheritTypes::{TextCast}; +use script::dom::bindings::codegen::InheritTypes::{NodeCast, TextCast}; use script::dom::bindings::js::JS; use script::dom::element::{Element, HTMLAreaElementTypeId, HTMLAnchorElementTypeId}; use script::dom::element::{HTMLLinkElementTypeId, LayoutElementHelpers, RawLayoutElementHelpers}; @@ -508,7 +508,7 @@ impl<'le> TElement<'le> for LayoutElement<'le> { fn get_link(self) -> Option<&'le str> { // FIXME: This is HTML only. - match self.element.node().type_id_for_layout() { + match NodeCast::from_actual(self.element).type_id_for_layout() { // http://www.whatwg.org/specs/web-apps/current-work/multipage/selectors.html# // selector-link ElementNodeTypeId(HTMLAnchorElementTypeId) | @@ -525,7 +525,7 @@ impl<'le> TElement<'le> for LayoutElement<'le> { #[inline] fn get_hover_state(self) -> bool { unsafe { - self.element.node().get_hover_state_for_layout() + NodeCast::from_actual(self.element).get_hover_state_for_layout() } } @@ -539,14 +539,14 @@ impl<'le> TElement<'le> for LayoutElement<'le> { #[inline] fn get_disabled_state(self) -> bool { unsafe { - self.element.node().get_disabled_state_for_layout() + NodeCast::from_actual(self.element).get_disabled_state_for_layout() } } #[inline] fn get_enabled_state(self) -> bool { unsafe { - self.element.node().get_enabled_state_for_layout() + NodeCast::from_actual(self.element).get_enabled_state_for_layout() } } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index b6da0dc39b1..79ecfe93743 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -183,11 +183,6 @@ impl Element { document, ElementBinding::Wrap) } - #[inline] - pub fn node<'a>(&'a self) -> &'a Node { - &self.node - } - #[inline] pub fn local_name<'a>(&'a self) -> &'a Atom { &self.local_name