Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove Element.node().

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-11-28 06:05:45 +09:00
parent d53ce7f8d2
commit 1305ac4dd0
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/wrapper.rs
View file

@ -39,7 +39,7 @@ use util::{PrivateLayoutData};
use gfx::display_list::OpaqueNode; use gfx::display_list::OpaqueNode;
use script::dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementCast}; use script::dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementCast};
use script::dom::bindings::codegen::InheritTypes::{HTMLImageElementCast, HTMLInputElementCast}; 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::bindings::js::JS;
use script::dom::element::{Element, HTMLAreaElementTypeId, HTMLAnchorElementTypeId}; use script::dom::element::{Element, HTMLAreaElementTypeId, HTMLAnchorElementTypeId};
use script::dom::element::{HTMLLinkElementTypeId, LayoutElementHelpers, RawLayoutElementHelpers}; 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> { fn get_link(self) -> Option<&'le str> {
// FIXME: This is HTML only. // 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# // http://www.whatwg.org/specs/web-apps/current-work/multipage/selectors.html#
// selector-link // selector-link
ElementNodeTypeId(HTMLAnchorElementTypeId) | ElementNodeTypeId(HTMLAnchorElementTypeId) |
@ -525,7 +525,7 @@ impl<'le> TElement<'le> for LayoutElement<'le> {
#[inline] #[inline]
fn get_hover_state(self) -> bool { fn get_hover_state(self) -> bool {
unsafe { 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] #[inline]
fn get_disabled_state(self) -> bool { fn get_disabled_state(self) -> bool {
unsafe { unsafe {
self.element.node().get_disabled_state_for_layout() NodeCast::from_actual(self.element).get_disabled_state_for_layout()
} }
} }
#[inline] #[inline]
fn get_enabled_state(self) -> bool { fn get_enabled_state(self) -> bool {
unsafe { unsafe {
self.element.node().get_enabled_state_for_layout() NodeCast::from_actual(self.element).get_enabled_state_for_layout()
} }
} }

5
components/script/dom/element.rs
View file

@ -183,11 +183,6 @@ impl Element {
document, ElementBinding::Wrap) document, ElementBinding::Wrap)
} }
#[inline]
pub fn node<'a>(&'a self) -> &'a Node {
&self.node
}
#[inline] #[inline]
pub fn local_name<'a>(&'a self) -> &'a Atom { pub fn local_name<'a>(&'a self) -> &'a Atom {
&self.local_name &self.local_name