diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2015-10-01 14:40:55 -0700 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2015-10-01 15:07:39 -0700 |
| commit | 6426f714bd869aeae1bda8e30575a0ad747f2bca (patch) | |
| tree | 34198d67f5ec27fa5064c0af95071204ccecf91b /components/layout/construct.rs | |
| parent | e2048d57c4c0602c5a6b82db8cb76e6c3e5467fa (diff) | |
| download | servo-6426f714bd869aeae1bda8e30575a0ad747f2bca.tar.gz servo-6426f714bd869aeae1bda8e30575a0ad747f2bca.zip | |
Incremental layout: Don't try to repair text fragment styles
Fixes #7814.
Diffstat (limited to 'components/layout/construct.rs')
| -rw-r--r-- | components/layout/construct.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 2421a797b43..73c353980a2 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -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() { |