mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
style: Rework -x-text-zoom to allow disabling text zoom and min-font-size separately
And use it instead of explicit document checks. This centralizes where we check for it. IsChromeDoc is relatively cheap, but this bug wants to also check for PDF.js which is a bit more expensive. No behavior change. Differential Revision: https://phabricator.services.mozilla.com/D176940
This commit is contained in:
parent
a6b97563c3
commit
a27f477c7d
10 changed files with 46 additions and 65 deletions
|
@ -1596,10 +1596,9 @@ impl<'le> TElement for GeckoElement<'le> {
|
|||
V: Push<ApplicableDeclarationBlock>,
|
||||
{
|
||||
use crate::properties::longhands::_x_lang::SpecifiedValue as SpecifiedLang;
|
||||
use crate::properties::longhands::_x_text_zoom::SpecifiedValue as SpecifiedZoom;
|
||||
use crate::properties::longhands::color::SpecifiedValue as SpecifiedColor;
|
||||
use crate::stylesheets::layer_rule::LayerOrder;
|
||||
use crate::values::specified::color::Color;
|
||||
use crate::values::specified::{color::Color, font::XTextScale};
|
||||
lazy_static! {
|
||||
static ref TABLE_COLOR_RULE: ApplicableDeclarationBlock = {
|
||||
let global_style_data = &*GLOBAL_STYLE_DATA;
|
||||
|
@ -1627,10 +1626,10 @@ impl<'le> TElement for GeckoElement<'le> {
|
|||
LayerOrder::root(),
|
||||
)
|
||||
};
|
||||
static ref SVG_TEXT_DISABLE_ZOOM_RULE: ApplicableDeclarationBlock = {
|
||||
static ref SVG_TEXT_DISABLE_SCALE_RULE: ApplicableDeclarationBlock = {
|
||||
let global_style_data = &*GLOBAL_STYLE_DATA;
|
||||
let pdb = PropertyDeclarationBlock::with_one(
|
||||
PropertyDeclaration::XTextZoom(SpecifiedZoom(false)),
|
||||
PropertyDeclaration::XTextScale(XTextScale::None),
|
||||
Importance::Normal,
|
||||
);
|
||||
let arc = Arc::new_leaked(global_style_data.shared_lock.wrap(pdb));
|
||||
|
@ -1653,7 +1652,7 @@ impl<'le> TElement for GeckoElement<'le> {
|
|||
}
|
||||
if ns == structs::kNameSpaceID_SVG as i32 {
|
||||
if self.local_name().as_ptr() == atom!("text").as_ptr() {
|
||||
hints.push(SVG_TEXT_DISABLE_ZOOM_RULE.clone());
|
||||
hints.push(SVG_TEXT_DISABLE_SCALE_RULE.clone());
|
||||
}
|
||||
}
|
||||
let declarations =
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue