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

style: Don't apply minimum font sizes to SVG text.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D74581
This commit is contained in:
longsonr 2020-05-13 09:10:54 +00:00 • committed by Emilio Cobos Álvarez
parent ec6ecf7d21
commit 4359aae44e
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/properties/cascade.rs
View file

@ -920,8 +920,8 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
let builder = &mut self.context.builder; let builder = &mut self.context.builder;
let parent_zoom = builder.get_parent_font().gecko().mAllowZoom; let parent_zoom = builder.get_parent_font().gecko().mAllowZoomAndMinSize;
let zoom = builder.get_font().gecko().mAllowZoom; let zoom = builder.get_font().gecko().mAllowZoomAndMinSize;
if zoom == parent_zoom { if zoom == parent_zoom {
return; return;
} }
@ -968,7 +968,7 @@ impl<'a, 'b: 'a> Cascade<'a, 'b> {
} }
let mut min = Au(parent_font.mScriptMinSize); let mut min = Au(parent_font.mScriptMinSize);
if font.mAllowZoom { if font.mAllowZoomAndMinSize {
min = builder.device.zoom_text(min); min = builder.device.zoom_text(min);
} }

6
components/style/properties/gecko.mako.rs
View file

@ -1108,12 +1108,12 @@ fn static_assert() {
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn set__x_text_zoom(&mut self, v: longhands::_x_text_zoom::computed_value::T) { pub fn set__x_text_zoom(&mut self, v: longhands::_x_text_zoom::computed_value::T) {
self.gecko.mAllowZoom = v.0; self.gecko.mAllowZoomAndMinSize = v.0;
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn copy__x_text_zoom_from(&mut self, other: &Self) { pub fn copy__x_text_zoom_from(&mut self, other: &Self) {
self.gecko.mAllowZoom = other.gecko.mAllowZoom; self.gecko.mAllowZoomAndMinSize = other.gecko.mAllowZoomAndMinSize;
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
@ -1123,7 +1123,7 @@ fn static_assert() {
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn clone__x_text_zoom(&self) -> longhands::_x_text_zoom::computed_value::T { pub fn clone__x_text_zoom(&self) -> longhands::_x_text_zoom::computed_value::T {
longhands::_x_text_zoom::computed_value::T(self.gecko.mAllowZoom) longhands::_x_text_zoom::computed_value::T(self.gecko.mAllowZoomAndMinSize)
} }
<% impl_simple_type_with_conversion("font_language_override", "mFont.languageOverride") %> <% impl_simple_type_with_conversion("font_language_override", "mFont.languageOverride") %>

4
components/style/values/computed/mod.rs
View file

@ -223,8 +223,8 @@ impl<'a> Context<'a> {
pub fn maybe_zoom_text(&self, size: CSSPixelLength) -> CSSPixelLength { pub fn maybe_zoom_text(&self, size: CSSPixelLength) -> CSSPixelLength {
// We disable zoom for <svg:text> by unsetting the // We disable zoom for <svg:text> by unsetting the
// -x-text-zoom property, which leads to a false value // -x-text-zoom property, which leads to a false value
// in mAllowZoom // in mAllowZoomAndMinSize
if self.style().get_font().gecko.mAllowZoom { if self.style().get_font().gecko.mAllowZoomAndMinSize {
self.device().zoom_text(Au::from(size)).into() self.device().zoom_text(Au::from(size)).into()
} else { } else {
size size