Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

make Node.type_id field private

Browse source
This commit is contained in:
Sean McArthur 2014-09-04 16:25:26 -07:00
parent 64a9075535
commit 375e475f99
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/layout/wrapper.rs
View file

@ -383,7 +383,7 @@ impl<'le> TElement for LayoutElement<'le> {
fn get_link(&self) -> Option<&'static str> { fn get_link(&self) -> Option<&'static str> {
// FIXME: This is HTML only. // FIXME: This is HTML only.
match self.element.node.type_id { match self.element.node.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) |

7
src/components/script/dom/node.rs
View file

@ -73,7 +73,7 @@ pub struct Node {
pub eventtarget: EventTarget, pub eventtarget: EventTarget,
/// The type of node that this is. /// The type of node that this is.
pub type_id: NodeTypeId, type_id: NodeTypeId,
/// The parent of this node. /// The parent of this node.
parent_node: Cell<Option<JS<Node>>>, parent_node: Cell<Option<JS<Node>>>,
@ -762,6 +762,7 @@ pub trait RawLayoutNodeHelpers {
unsafe fn get_hover_state_for_layout(&self) -> bool; unsafe fn get_hover_state_for_layout(&self) -> bool;
unsafe fn get_disabled_state_for_layout(&self) -> bool; unsafe fn get_disabled_state_for_layout(&self) -> bool;
unsafe fn get_enabled_state_for_layout(&self) -> bool; unsafe fn get_enabled_state_for_layout(&self) -> bool;
fn type_id_for_layout(&self) -> NodeTypeId;
} }
impl RawLayoutNodeHelpers for Node { impl RawLayoutNodeHelpers for Node {
@ -774,6 +775,10 @@ impl RawLayoutNodeHelpers for Node {
unsafe fn get_enabled_state_for_layout(&self) -> bool { unsafe fn get_enabled_state_for_layout(&self) -> bool {
(*self.unsafe_get_flags()).contains(InEnabledState) (*self.unsafe_get_flags()).contains(InEnabledState)
} }
fn type_id_for_layout(&self) -> NodeTypeId {
self.type_id
}
} }

2
src/components/script/script_task.rs
View file

@ -208,7 +208,7 @@ trait PrivateScriptTaskHelpers {
impl<'a> PrivateScriptTaskHelpers for JSRef<'a, Node> { impl<'a> PrivateScriptTaskHelpers for JSRef<'a, Node> {
fn click_event_filter_by_disabled_state(&self) -> bool { fn click_event_filter_by_disabled_state(&self) -> bool {
match self.type_id { match self.type_id() {
ElementNodeTypeId(HTMLButtonElementTypeId) | ElementNodeTypeId(HTMLButtonElementTypeId) |
ElementNodeTypeId(HTMLInputElementTypeId) | ElementNodeTypeId(HTMLInputElementTypeId) |
// ElementNodeTypeId(HTMLKeygenElementTypeId) | // ElementNodeTypeId(HTMLKeygenElementTypeId) |