text: Do not show text that's missing an embedded font #18856
Conversation
kjarosh
added
text
| @@ -862,9 +862,9 @@ impl<'a, 'gc> LayoutContext<'a, 'gc> { | |||
| fn left_alignment_offset(span: &TextSpan, is_first_line: bool) -> Twips { | |||
| if span.bullet { | |||
| if is_first_line { | |||
| Twips::from_pixels(35.0 + span.left_margin + span.block_indent + span.indent) | |||
| Twips::from_pixels(36.0 + span.left_margin + span.block_indent + span.indent) | |||
There was a problem hiding this comment.
Was this just to make the tests pass better? The change is kinda out of nowhere ;D
There was a problem hiding this comment.
Yes, I added a test that verifies how the bullet behaves when there's no font (to make sure I'm not breaking anything), and it turned out the bullet was misaligned by one pixel 😅
| @@ -660,10 +660,10 @@ impl<'a, 'gc> LayoutContext<'a, 'gc> { | |||
| { | |||
| return font; | |||
| } | |||
| // TODO: If set to use embedded fonts and we couldn't find any matching font, show nothing | |||
| // However - at time of writing, we don't support DefineFont4. If we matched this behaviour, | |||
| // then a bunch of SWFs would just show no text suddenly. | |||
There was a problem hiding this comment.
just to be sure, did you test some SWFs like this?
There was a problem hiding this comment.
Generally yes, I made sure that Flash behaves this way and most SWFs from my text collection work.
However, I've just remembered one SWF that used a wrong font: #14740, and unfortunately checking it now, it turns out the text disappears in it. Which makes sense, because now Ruffle somehow fails to load the embedded font and falls back to a device font :/
So I guess there are (and probably will be) cases when Ruffle fails to load an embedded font. Some probably are hard to spot.
kjarosh
force-pushed
the
missing-font
branch
from
335c174 to
4b6257e
Compare
Apparently it should be 36px, not 35px.
Flash Player does not show any text that requires an embedded font that is missing.
This test verifies how bullets are rendered and which font should be used.
This test verifies how FP behaves when we want to get some metrics related to text that uses a font which is missing.
kjarosh
force-pushed
the
missing-font
branch
from
4b6257e to
765ff8f
Compare
kjarosh
removed
the
waiting-on-review
Flash Player does not show any text that requires an embedded font that is missing.
As we now support DefineFont4, we're safe to remove the fallback device font.