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

Fixed the inline_element_border_a reftest with incremental layout turned on.

Browse source
This commit is contained in:
Clark Gaebel 2014-10-16 19:18:45 -07:00
parent 2faf5b270f
commit 8496c056e7
6 changed files with 60 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

59
components/layout/inline.rs
View file

@ -405,11 +405,14 @@ impl LineBreaker {
let writing_mode = self.floats.writing_mode;
let split_fragment = |split: SplitInfo| {
let info = ScannedTextFragmentInfo::new(run.clone(), split.range);
let specific = ScannedTextFragment(info);
let info =
ScannedTextFragmentInfo::new(
run.clone(),
split.range,
in_fragment.border_box.size.inline);
let size = LogicalSize::new(
writing_mode, split.inline_size, in_fragment.border_box.size.block);
in_fragment.transform(size, specific)
in_fragment.transform(size, info)
};
debug!("LineBreaker: Pushing the fragment to the inline_start of the new-line character \
@ -493,12 +496,15 @@ impl LineBreaker {
line_is_empty);
match split.map(|(inline_start, inline_end, run)| {
let split_fragment = |split: SplitInfo| {
let info = ScannedTextFragmentInfo::new(run.clone(), split.range);
let specific = ScannedTextFragment(info);
let info =
ScannedTextFragmentInfo::new(
run.clone(),
split.range,
in_fragment.border_box.size.inline);
let size = LogicalSize::new(self.floats.writing_mode,
split.inline_size,
in_fragment.border_box.size.block);
in_fragment.transform(size, specific)
in_fragment.transform(size, info)
};
(inline_start.map(|x| {
@ -568,6 +574,13 @@ pub struct InlineFragments {
pub fragments: Vec<Fragment>,
}
impl fmt::Show for InlineFragments {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.fragments)
}
}
impl InlineFragments {
/// Creates an empty set of inline fragments.
pub fn new() -> InlineFragments {
@ -576,26 +589,6 @@ impl InlineFragments {
}
}
pub fn debug_show(&self) -> String {
let mut ret = String::new();
ret.push_str("[ ");
for (i, fragment) in self.fragments.iter().enumerate() {
if i != 0 {
ret.push_str(", ");
}
ret.push_str(fragment.debug_show().as_slice());
}
if self.is_empty() {
ret.push_str("]");
} else {
ret.push_str(" ]");
}
ret
}
/// Returns the number of inline fragments.
pub fn len(&self) -> uint {
self.fragments.len()
@ -998,10 +991,6 @@ impl Flow for InlineFlow {
InlineFlowClass
}
fn debug_print(&self) -> String {
format!("{} - {:x} - {}", self.class(), self.base.debug_id(), self.fragments.debug_show())
}
fn as_immutable_inline<'a>(&'a self) -> &'a InlineFlow {
self
}
@ -1268,15 +1257,7 @@ impl Flow for InlineFlow {
impl fmt::Show for InlineFlow {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(write!(f, "InlineFlow"));
for (i, fragment) in self.fragments.fragments.iter().enumerate() {
if i == 0 {
try!(write!(f, ": {}", fragment))
} else {
try!(write!(f, ", {}", fragment))
}
}
write!(f, " ({})", self.base)
write!(f, "{} - {:x} - {}", self.class(), self.base.debug_id(), self.fragments)
}
}