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

Preserve the un-truncated version of fragments

Browse source 
Fixes #14952
This commit is contained in:
Michael Howell 2017-01-12 18:34:36 +00:00
parent 8a90cda09f
commit cef4ebed20
3 changed files with 154 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/layout/display_list_builder.rs
View file

@ -19,7 +19,7 @@ use flex::FlexFlow;
use flow::{BaseFlow, Flow, IS_ABSOLUTELY_POSITIONED};
use flow_ref::FlowRef;
use fragment::{CoordinateSystem, Fragment, ImageFragmentInfo, ScannedTextFragmentInfo};
use fragment::SpecificFragmentInfo;
use fragment::{SpecificFragmentInfo, TruncatedFragmentInfo};
use gfx::display_list::{BLUR_INFLATION_FACTOR, BaseDisplayItem, BorderDisplayItem};
use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, ClippingRegion};
use gfx::display_list::{DisplayItem, DisplayItemMetadata, DisplayList, DisplayListSection};
@ -1402,7 +1402,11 @@ impl FragmentDisplayListBuilding for Fragment {
self.stacking_relative_content_box(stacking_relative_border_box);
match self.specific {
SpecificFragmentInfo::ScannedText(ref text_fragment) => {
SpecificFragmentInfo::TruncatedFragment(box TruncatedFragmentInfo {
text_info: Some(ref text_fragment),
..
}) |
SpecificFragmentInfo::ScannedText(box ref text_fragment) => {
// Create items for shadows.
//
// NB: According to CSS-BACKGROUNDS, text shadows render in *reverse* order (front
@ -1410,7 +1414,7 @@ impl FragmentDisplayListBuilding for Fragment {
for text_shadow in self.style.get_inheritedtext().text_shadow.0.iter().rev() {
self.build_display_list_for_text_fragment(state,
&**text_fragment,
&*text_fragment,
&stacking_relative_content_box,
Some(text_shadow),
clip);
@ -1418,7 +1422,7 @@ impl FragmentDisplayListBuilding for Fragment {
// Create the main text display item.
self.build_display_list_for_text_fragment(state,
&**text_fragment,
&*text_fragment,
&stacking_relative_content_box,
None,
clip);
@ -1428,7 +1432,7 @@ impl FragmentDisplayListBuilding for Fragment {
self.style(),
stacking_relative_border_box,
&stacking_relative_content_box,
&**text_fragment,
&*text_fragment,
clip);
}
}
@ -1443,6 +1447,7 @@ impl FragmentDisplayListBuilding for Fragment {
SpecificFragmentInfo::InlineBlock(_) |
SpecificFragmentInfo::InlineAbsoluteHypothetical(_) |
SpecificFragmentInfo::InlineAbsolute(_) |
SpecificFragmentInfo::TruncatedFragment(_) |
SpecificFragmentInfo::Svg(_) => {
if opts::get().show_debug_fragment_borders {
self.build_debug_borders_around_fragment(state,