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

Auto merge of #6698 - Ms2ger:layoutelement, r=jdm

Browse source 
Implement some methods on LayoutJS<Element>.

Part of my long-term plan to stop exposing `unsafe_get()` outside the script crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6698)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-22 21:10:04 -06:00
commit 37a1e22515
2 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout/wrapper.rs
View file

@ -383,11 +383,9 @@ pub struct LayoutElement<'le> {
impl<'le> LayoutElement<'le> {
pub fn style_attribute(&self) -> &'le Option<PropertyDeclarationBlock> {
use script::dom::element::ElementHelpers;
let style: &Option<PropertyDeclarationBlock> = unsafe {
&*(*self.element.unsafe_get()).style_attribute().borrow_for_layout()
};
style
unsafe {
&*self.element.style_attribute()
}
}
}
@ -404,23 +402,18 @@ impl<'le> ::selectors::Element for LayoutElement<'le> {
#[inline]
fn get_local_name<'a>(&'a self) -> &'a Atom {
unsafe {
(*self.element.unsafe_get()).local_name()
}
self.element.local_name()
}
#[inline]
fn get_namespace<'a>(&'a self) -> &'a Namespace {
use script::dom::element::ElementHelpers;
unsafe {
(*self.element.unsafe_get()).namespace()
}
self.element.namespace()
}
fn is_link(&self) -> bool {
// FIXME: This is HTML only.
let node = NodeCast::from_layout_js(&self.element);
match unsafe { (*node.unsafe_get()).type_id_for_layout() } {
let node = self.as_node();
match node.type_id() {
// https://html.spec.whatwg.org/multipage/#selector-link
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement)) |
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAreaElement)) |