Change ParagraphBuilder to replace the parent style's font families with the child style's font families #10074

jason-simmons · 2019-07-23T23:26:39Z

Previously ParagraphBuilder was concatenating the child's fonts to the
parent's font list, causing the parent's fonts to take precedence.

Fixes flutter/flutter#35992

GaryQian

LGTM!

chinmaygarde · 2019-07-23T23:33:54Z

lib/ui/text/paragraph_builder.cc

  if (mask & tsFontFamilyMask) {
-    style.font_families.insert(style.font_families.end(), fontFamilies.begin(),
-                               fontFamilies.end());
+    style.font_families = fontFamilies;


Can you add a note here stating that fallback to system is intended?

…ith the child style's font families Previously ParagraphBuilder was concatenating the child's fonts to the parent's font list, causing the parent's fonts to take precedence. Fixes flutter/flutter#35992

…milies with the child style's font families (flutter/engine#10074)

googlebot added the cla: yes label Jul 23, 2019

jason-simmons requested a review from GaryQian July 23, 2019 23:26

GaryQian approved these changes Jul 23, 2019

View reviewed changes

chinmaygarde reviewed Jul 23, 2019

View reviewed changes

Change ParagraphBuilder to replace the parent style's font families w…

d2801fb

…ith the child style's font families Previously ParagraphBuilder was concatenating the child's fonts to the parent's font list, causing the parent's fonts to take precedence. Fixes flutter/flutter#35992

jason-simmons force-pushed the bug_35992 branch from 1aa0493 to d2801fb Compare July 23, 2019 23:43

chinmaygarde approved these changes Jul 24, 2019

View reviewed changes

jason-simmons merged commit f7e0614 into flutter:master Jul 24, 2019

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

7f96778

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..c4c64896a018 (12 commits) flutter/flutter#36795

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

7366bed

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..cf5d76c1720a (13 commits) flutter/flutter#36799

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

2aac8b3

…milies with the child style's font families (flutter/engine#10074)

This was referenced Jul 24, 2019

Roll engine ef99738bafc0..72f747ae4300 (15 commits) flutter/flutter#36802

Closed

Roll engine ef99738bafc0..0e621d902d67 (17 commits) flutter/flutter#36807

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

5a78c1c

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

0b7a426

…milies with the child style's font families (flutter/engine#10074)

This was referenced Jul 24, 2019

Roll engine ef99738bafc0..9e7260b9dc2f (18 commits) flutter/flutter#36811

Closed

Roll engine ef99738bafc0..20dc1728243d (19 commits) flutter/flutter#36813

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

f3b4fbd

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..20dc1728243d (19 commits) flutter/flutter#36814

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

6172c1f

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..d27a6373d0ff (20 commits) flutter/flutter#36820

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

a1b0364

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..d27a6373d0ff (20 commits) flutter/flutter#36821

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

d3281ad

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..d27a6373d0ff (20 commits) flutter/flutter#36823

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

ffed664

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..a4d2d3648a03 (21 commits) flutter/flutter#36824

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

5ffe4d9

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..4bf81b8cf8e3 (37 commits) flutter/flutter#36883

Closed

a-siva mentioned this pull request Jul 24, 2019

Manual roll of flutter/[email protected] flutter/flutter#36885

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

807ea59

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..4bf81b8cf8e3 (37 commits) flutter/flutter#36890

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

fd41c41

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 24, 2019

Roll engine ef99738bafc0..aaf6bad4be73 (38 commits) flutter/flutter#36892

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

8bf1fb9

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..cfd43a1051a5 (40 commits) flutter/flutter#36896

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

a66bf35

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..cfd43a1051a5 (40 commits) flutter/flutter#36897

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

80e780e

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..fcd67323b2cd (41 commits) flutter/flutter#36903

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

7848cc1

…milies with the child style's font families (flutter/engine#10074)

This was referenced Jul 25, 2019

Roll engine ef99738bafc0..fcd67323b2cd (41 commits) flutter/flutter#36904

Closed

Roll engine ef99738bafc0..fcd67323b2cd (41 commits) flutter/flutter#36907

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

76ad7dc

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

92d988b

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..fcd67323b2cd (41 commits) flutter/flutter#36909

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

60d7f68

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..fcd67323b2cd (41 commits) flutter/flutter#36911

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

9924ab8

…milies with the child style's font families (flutter/engine#10074)

This was referenced Jul 25, 2019

Roll engine ef99738bafc0..89142b55db0d (43 commits) flutter/flutter#36914

Closed

Roll engine ef99738bafc0..89142b55db0d (43 commits) flutter/flutter#36916

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

3714d93

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..89142b55db0d (43 commits) flutter/flutter#36919

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

7808fcd

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

38a4197

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..89142b55db0d (43 commits) flutter/flutter#36920

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019

f7e0614 Change ParagraphBuilder to replace the parent style's font fa…

845bdd5

…milies with the child style's font families (flutter/engine#10074)

engine-flutter-autoroll mentioned this pull request Jul 25, 2019

Roll engine ef99738bafc0..89142b55db0d (43 commits) flutter/flutter#36921

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Change ParagraphBuilder to replace the parent style's font families with the child style's font families #10074

Change ParagraphBuilder to replace the parent style's font families with the child style's font families #10074

Uh oh!

jason-simmons commented Jul 23, 2019

Uh oh!

GaryQian left a comment

Uh oh!

chinmaygarde Jul 23, 2019

Uh oh!

jason-simmons Jul 23, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Change ParagraphBuilder to replace the parent style's font families with the child style's font families #10074

Change ParagraphBuilder to replace the parent style's font families with the child style's font families #10074

Uh oh!

Conversation

jason-simmons commented Jul 23, 2019

Uh oh!

GaryQian left a comment

Choose a reason for hiding this comment

Uh oh!

chinmaygarde Jul 23, 2019

Choose a reason for hiding this comment

Uh oh!

jason-simmons Jul 23, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants