Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 24, 2019
Merged

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

merged 1 commit into from
Jul 24, 2019

Conversation

jason-simmons
Copy link
Member

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 jason-simmons requested a review from GaryQian July 23, 2019 23:26
GaryQian
GaryQian approved these changes Jul 23, 2019
View reviewed changes
Copy link
Contributor

@GaryQian GaryQian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

chinmaygarde
chinmaygarde reviewed Jul 23, 2019
View reviewed changes
lib/ui/text/paragraph_builder.cc
@@ -438,8 +438,7 @@ void ParagraphBuilder::pushStyle(tonic::Int32List& encoded,
}

if (mask & tsFontFamilyMask) {
style.font_families.insert(style.font_families.end(), fontFamilies.begin(),
fontFamilies.end());
style.font_families = fontFamilies;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@jason-simmons
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 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
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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
@engine-flutter-autoroll
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
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
@a-siva a-siva mentioned this pull request Jul 24, 2019
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 24, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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
Closed
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 25, 2019
@engine-flutter-autoroll
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 engine-flutter-autoroll mentioned this pull request Jul 25, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chinmaygarde chinmaygarde chinmaygarde approved these changes

@GaryQian GaryQian GaryQian approved these changes

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Nested TextSpans lose fontFamily
4 participants
@jason-simmons @chinmaygarde @GaryQian @googlebot