diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-04-20 00:20:41 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 00:20:41 -0500 |
commit | 7919e591a46274c0d7f3a7c7c99d2643d55d60f1 (patch) | |
tree | 73052e1f59112f186cb1f3b9ddfddea1f5caa09f /components/script_layout_interface/lib.rs | |
parent | f74f1fb59233c3f366cec4ace5df37c0264786be (diff) | |
parent | 3162babada7a1c6d5a4dd2eb260f02545abef323 (diff) | |
download | servo-7919e591a46274c0d7f3a7c7c99d2643d55d60f1.tar.gz servo-7919e591a46274c0d7f3a7c7c99d2643d55d60f1.zip |
Auto merge of #16539 - Manishearth:stylo-scriptminsize, r=heycam
stylo: Properly support -moz-script-size-multiplier, -moz-script-level, and -moz-script-min-size
r=heycam https://bugzilla.mozilla.org/show_bug.cgi?id=1355427
(copying over the relevant commit message so that it doesn't get lost in the vcssync)
scriptlevel is a property that affects how font-size is inherited. If scriptlevel is
+1, for example, it will inherit as the script size multiplier times
the parent font. This does not affect cases where the font-size is
explicitly set.
However, this transformation is not allowed to reduce the size below
scriptminsize. If this inheritance will reduce it to below
scriptminsize, it will be set to scriptminsize or the parent size,
whichever is smaller (the parent size could be smaller than the min size
because it was explicitly specified).
Now, within a node that has inherited a font-size which was
crossing scriptminsize once the scriptlevel was applied, a negative
scriptlevel may be used to increase the size again.
This should work, however if we have already been capped by the
scriptminsize multiple times, this can lead to a jump in the size.
For example, if we have text of the form:
huge large medium small tiny reallytiny tiny small medium huge
which is represented by progressive nesting and scriptlevel values of
+1 till the center after which the scriptlevel is -1, the "tiny"s should
be the same size, as should be the "small"s and "medium"s, etc.
However, if scriptminsize kicked it at around "medium", then
medium/tiny/reallytiny will all be the same size (the min size).
A -1 scriptlevel change after this will increase the min size by the
multiplier, making the second tiny larger than medium.
Instead, we wish for the second "tiny" to still be capped by the script
level, and when we reach the second "large", it should be the same size
as the original one.
We do this by cascading two separate font sizes. The font size (mSize)
is the actual displayed font size. The unconstrained font size
(mScriptUnconstrainedSize) is the font size in the situation where
scriptminsize never applied.
We calculate the proposed inherited font size based on scriptlevel and
the parent unconstrained size, instead of using the parent font size.
This is stored in the node's unconstrained size and will also be stored
in the font size provided that it is above the min size.
All of this only applies when inheriting. When the font size is
manually set, scriptminsize does not apply, and both the real and
unconstrained size are set to the explicit value. However, if the font
size is manually set to an em or percent unit, the unconstrained size
will be set to the value of that unit computed against the parent
unconstrained size, whereas the font size will be set computing against
the parent font size.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16539)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface/lib.rs')
0 files changed, 0 insertions, 0 deletions