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

auto merge of #3592 : zwarich/servo/trailing-whitespace, r=Manishearth

Browse source 
The Mach test runner doesn't actually make these failures yet, which is
tracked by #3482.
This commit is contained in:
bors-servo 2014-10-07 04:57:29 -06:00
commit ae946a9b76
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/fragment.rs
View file

@ -1537,7 +1537,7 @@ impl Fragment {
match self.specific { match self.specific {
InlineAbsoluteHypotheticalFragment(ref mut info) => { InlineAbsoluteHypotheticalFragment(ref mut info) => {
let block_flow = info.flow_ref.get_mut().as_block(); let block_flow = info.flow_ref.get_mut().as_block();
block_flow.base.position.size.inline = block_flow.base.position.size.inline =
block_flow.base.intrinsic_inline_sizes.preferred_inline_size + block_flow.base.intrinsic_inline_sizes.preferred_inline_size +
block_flow.base.intrinsic_inline_sizes.surround_inline_size; block_flow.base.intrinsic_inline_sizes.surround_inline_size;

2
components/layout/wrapper.rs
View file

@ -187,7 +187,7 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
unsafe { unsafe {
if self.get().is_text() { if self.get().is_text() {
let text: JS<Text> = self.get_jsmanaged().transmute_copy(); let text: JS<Text> = self.get_jsmanaged().transmute_copy();
(*text.unsafe_get()).characterdata.data.borrow().clone() (*text.unsafe_get()).characterdata.data.borrow().clone()
} else if self.get().is_htmlinputelement() { } else if self.get().is_htmlinputelement() {
let input: JS<HTMLInputElement> = self.get_jsmanaged().transmute_copy(); let input: JS<HTMLInputElement> = self.get_jsmanaged().transmute_copy();
input.get_value_for_layout() input.get_value_for_layout()