corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #7821 - Incremental layout: Don't try to repair text fragment styles (from mbrubeck:class-damage); r=pcwalton

Browse Source 
Fixes #7814. r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 69db83476d02d06658ad084a834abc94f7f008d0
This commit is contained in:
Matt Brubeck
2015-10-02 02:27:31 -06:00
parent 8029f203b4
commit 4f3437f448
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
servo/components/layout/construct.rs
View File

@@ -1375,11 +1375,17 @@ impl<'a> FlowConstructor<'a> {
// FIXME(pcwalton): Fragment restyle damage too?
flow_ref.repair_style_and_bubble_inline_sizes(&style);
}
SpecificFragmentInfo::ScannedText(_) |
SpecificFragmentInfo::ScannedText(_) => {
// Text fragments in ConstructionResult haven't been scanned yet
unreachable!()
}
SpecificFragmentInfo::GeneratedContent(_) |
SpecificFragmentInfo::UnscannedText(_) => {
properties::modify_style_for_text(&mut style);
properties::modify_style_for_replaced_content(&mut style);
fragment.repair_style(&style);
// We can't repair this unscanned text; we need to update the
// scanned text fragments.
//
// TODO: Add code to find and repair the ScannedText fragments?
return false
}
_ => {
if node.is_replaced_content() {