Remove useless font_size parameter when building Layouts

Also fix a missing font size for fonts inserted for forms.

Author: liZe

weasyprint/css/computed_values.py

@@ -748,7 +748,7 @@ def strut_layout(style, context=None):
         if key in context.strut_layouts:
             return context.strut_layouts[key]
 
-    layout = Layout(context, style['font_size'], style)
+    layout = Layout(context, style)
     layout.set_text(' ')
     line, _ = layout.get_first_line()
     _, _, _, _, text_height, baseline = first_line_metrics(
@@ -782,11 +782,10 @@ def character_ratio(style, character):
     style = style.copy()
     style['letter_spacing'] = 'normal'
     style['word_spacing'] = 0
-
     # Random big value
-    font_size = 1000
+    style['font_size'] = 1000
 
-    layout = Layout(context=None, font_size=font_size, style=style)
+    layout = Layout(context=None, style=style)
     layout.set_text(character)
     line, _ = layout.get_first_line()
 
@@ -802,6 +801,6 @@ def character_ratio(style, character):
 
     # Zero means some kind of failure, fallback is 0.5.
     # We round to try keeping exact values that were altered by Pango.
-    ratio = round(measure / font_size, 5) or 0.5
+    ratio = round(measure / style['font_size'], 5) or 0.5
     cache[cache_key] = ratio
     return ratio

weasyprint/text/fonts.py

@@ -330,7 +330,7 @@ def font_features(font_kerning='normal', font_variant_ligatures='normal',
     return features
 
 
-def get_font_description(style, font_size=None):
+def get_font_description(style):
     font_description = ffi.gc(
         pango.pango_font_description_new(),
         pango.pango_font_description_free)
@@ -342,9 +342,8 @@ def get_font_description(style, font_size=None):
         font_description, PANGO_STRETCH[style['font_stretch']])
     pango.pango_font_description_set_weight(
         font_description, style['font_weight'])
-    if font_size is not None:
-        pango.pango_font_description_set_absolute_size(
-            font_description, units_from_double(font_size))
+    pango.pango_font_description_set_absolute_size(
+        font_description, units_from_double(style['font_size']))
     if style['font_variation_settings'] != 'normal':
         string = ','.join(
             f'{key}={value}' for key, value in

weasyprint/text/line_break.py

@@ -58,13 +58,13 @@ def first_line_metrics(first_line, text, layout, resume_at, space_collapse,
 
 class Layout:
     """Object holding PangoLayout-related cdata pointers."""
-    def __init__(self, context, font_size, style, justification_spacing=0,
+    def __init__(self, context, style, justification_spacing=0,
                  max_width=None):
         self.justification_spacing = justification_spacing
-        self.setup(context, font_size, style)
+        self.setup(context, style)
         self.max_width = max_width
 
-    def setup(self, context, font_size, style):
+    def setup(self, context, style):
         self.context = context
         self.style = style
         self.first_line_direction = 0
@@ -94,7 +94,7 @@ def setup(self, context, font_size, style):
 
         assert not isinstance(style['font_family'], str), (
             'font_family should be a list')
-        font_description = get_font_description(style, font_size)
+        font_description = get_font_description(style)
         self.layout = ffi.gc(
             pango.pango_layout_new(pango_context),
             gobject.g_object_unref)
@@ -203,8 +203,7 @@ def add_attr(start, end, spacing):
     def set_tabs(self):
         if isinstance(self.style['tab_size'], int):
             layout = Layout(
-                self.context, self.style['font_size'], self.style,
-                self.justification_spacing)
+                self.context, self.style, self.justification_spacing)
             layout.set_text(' ' * self.style['tab_size'])
             line, _ = layout.get_first_line()
             width, _ = line_size(line, self.style)
@@ -222,7 +221,7 @@ def deactivate(self):
         del self.layout, self.language, self.style
 
     def reactivate(self, style):
-        self.setup(self.context, style['font_size'], style)
+        self.setup(self.context, style)
         self.set_text(self.text, justify=True)
 
 
@@ -236,8 +235,7 @@ def create_layout(text, style, context, max_width, justification_spacing):
         or ``None`` for unlimited width.
 
     """
-    layout = Layout(
-        context, style['font_size'], style, justification_spacing, max_width)
+    layout = Layout(context, style, justification_spacing, max_width)
 
     # Make sure that max_width * Pango.SCALE == max_width * 1024 fits in a
     # signed integer. Treat bigger values same as None: unconstrained width.