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

Auto merge of #7867 - Ms2ger:layoutjs, r=nox

Browse source 
Move some methods from RawLayoutElementHelpers to LayoutElementHelpers.

This is part of a long-term plan to ensure layout never has access to
unwrapped pointers to DOM objects. The remaining methods on the
RawLayoutElementHelpers trait are harder to move, because of the lifetimes in
their signatures.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7867)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-05 08:19:21 -06:00
commit a350b215cc
2 changed files with 80 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/wrapper.rs
View file

@ -516,14 +516,14 @@ impl<'le> ::selectors::Element for LayoutElement<'le> {
#[inline]
fn has_class(&self, name: &Atom) -> bool {
unsafe {
(*self.element.unsafe_get()).has_class_for_layout(name)
self.element.has_class_for_layout(name)
}
}
#[inline(always)]
fn each_class<F>(&self, mut callback: F) where F: FnMut(&Atom) {
unsafe {
match (*self.element.unsafe_get()).get_classes_for_layout() {
match self.element.get_classes_for_layout() {
None => {}
Some(ref classes) => {
for class in *classes {
@ -572,13 +572,13 @@ impl<'le> TElementAttributes for LayoutElement<'le> {
where V: VecLike<DeclarationBlock<Vec<PropertyDeclaration>>>
{
unsafe {
(*self.element.unsafe_get()).synthesize_presentational_hints_for_legacy_attributes(hints);
self.element.synthesize_presentational_hints_for_legacy_attributes(hints);
}
}
fn get_unsigned_integer_attribute(&self, attribute: UnsignedIntegerAttribute) -> Option<u32> {
unsafe {
(*self.element.unsafe_get()).get_unsigned_integer_attribute_for_layout(attribute)
self.element.get_unsigned_integer_attribute_for_layout(attribute)
}
}
@ -840,7 +840,7 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
let elem: Option<LayoutJS<Element>> = ElementCast::to_layout_js(self.get_jsmanaged());
match elem {
Some(element) => {
(*element.unsafe_get()).get_unsigned_integer_attribute_for_layout(attribute)
element.get_unsigned_integer_attribute_for_layout(attribute)
}
None => panic!("not an element!")
}