[Impeller] Use new SkParagraph APIs for stroked text. #41735

jonahwilliams · 2023-05-04T16:57:05Z

~~Requires https://skia-review.googlesource.com/c/skia/+/692196~~ Landed

Looks correct on iOS, renders incorrectly on Android 🤷 . Might be related to all of our text bounds looking off.

iOS

Android

…31322

flutter-dashboard · 2023-07-11T02:54:21Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

jonahwilliams · 2023-07-11T02:58:52Z

I see a revert just got queued up for the Skia change so I've moved this back to WIP

chinmaygarde · 2023-07-11T16:48:41Z

🙃

jonahwilliams · 2023-07-11T22:34:35Z

Hey it relanded.

…31322

bdero

Question about the bounds offset, but overall LGTM!

bdero · 2023-07-11T23:30:12Z

impeller/typographer/backends/skia/text_frame_skia.h

 #pragma once

 #include "flutter/fml/macros.h"
+#include "impeller/geometry/path.h"


Nit: Remove unused include

bdero · 2023-07-11T23:46:00Z

impeller/display_list/dl_dispatcher.cc

+      return;
+    }
+    canvas_.Save();
+    canvas_.Translate({x + bounds->origin.x, y + bounds->origin.y, 0.0});


Is the frame bounds origin actually the right thing to be adding here? It would seem weird for Skia's API to circularly depend on the text frame bounds origin when coming up with path coords to output. Needing to add in something like the baseline offset would make sense, though.

To be honest I don't really know. This is similar to the approach I used when drawing with different color sources on top of the text: https://github.com/flutter/engine/blob/main/impeller/aiks/canvas.cc#L529-L534

bdero · 2023-07-11T23:47:29Z

impeller/display_list/skia_conversions.cc

+    return {};
+  }
+
+  return ToPath(skia::textlayout::Paragraph::GetPath(blob.get()));


Well I'll be damned. That's a lot easier than I was expecting!

Well, I had to wait 3 months for the API to be added so IMO not that easy 😆

bdero · 2023-07-11T23:50:37Z

impeller/display_list/dl_dispatcher.cc

 }

 // |flutter::DlOpReceiver|
 void DlDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,


I don't think it's strictly necessary, but adding a playground test in display_list_unittests.cc would be nice as a jumping off point for debugging in the future.

Good idea, will do.

…ter/engine#41735)

…130458) flutter/engine@16e2ab7...1b1ccdd 2023-07-12 [email protected] Roll Skia from 4e989b1564ee to bedc92598644 (1 revision) (flutter/engine#43617) 2023-07-12 [email protected] move rtree and canvas_spy sources to Fuchsia sub-directory (flutter/engine#43615) 2023-07-12 [email protected] Roll Skia from 68e3c0b3eea7 to 4e989b1564ee (6 revisions) (flutter/engine#43614) 2023-07-12 [email protected] Document (and assert) that channel names can't contains nulls (flutter/engine#43593) 2023-07-12 [email protected] Reland "Refactor JSNumber.toDart and Object.toJS" (flutter/engine#43363) 2023-07-12 [email protected] Add a flag to `ParagraphBuilder` for rounding hack migration (flutter/engine#43118) 2023-07-12 [email protected] [Impeller] Fixes for asymmetric stencil descriptors (flutter/engine#43535) 2023-07-12 [email protected] Roll Skia from adeeb8d50f7c to 68e3c0b3eea7 (1 revision) (flutter/engine#43609) 2023-07-12 [email protected] Add comment to use of 3x3 mapRect in TransformLayer (flutter/engine#43608) 2023-07-12 [email protected] Roll Skia from a251a36ea519 to adeeb8d50f7c (1 revision) (flutter/engine#43606) 2023-07-12 [email protected] Roll Dart SDK from b95f6531c726 to 8f8f281ccdc6 (2 revisions) (flutter/engine#43607) 2023-07-12 [email protected] Roll Skia from ebc149cff431 to a251a36ea519 (2 revisions) (flutter/engine#43604) 2023-07-12 [email protected] [Impeller] Use new SkParagraph APIs for stroked text. (flutter/engine#41735) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…ter/engine#41735)

…130496) Roll Flutter Engine from 16e2ab7e986c to b4080361f2f9 (28 revisions) flutter/engine@16e2ab7...b408036 2023-07-13 [email protected] Roll Skia from e5ec341bc3ca to 56b68ce6196c (1 revision) (flutter/engine#43633) 2023-07-13 [email protected] Roll Dart SDK from f499e91e8cb2 to ade4dae923f3 (1 revision) (flutter/engine#43632) 2023-07-13 [email protected] Roll Skia from 811b046c673b to e5ec341bc3ca (1 revision) (flutter/engine#43631) 2023-07-13 [email protected] Make GOMA state automatic by default (flutter/engine#43584) 2023-07-13 [email protected] Roll Skia from c8da0c657c4e to 811b046c673b (3 revisions) (flutter/engine#43630) 2023-07-13 [email protected] [Impeller] Remove unactionable error logs and use structure chains for instance creation. (flutter/engine#43629) 2023-07-13 [email protected] Roll Skia from 7f391ea9164e to c8da0c657c4e (1 revision) (flutter/engine#43628) 2023-07-13 [email protected] [Impeller] Add RAII wrappers for VMA objects. (flutter/engine#43626) 2023-07-13 [email protected] Roll Fuchsia Linux SDK from 1STsUj0X5YgpiSNEb... to xBJq6PsO5ebblODMe... (flutter/engine#43627) 2023-07-13 [email protected] Roll Skia from 6ed93436d57c to 7f391ea9164e (1 revision) (flutter/engine#43625) 2023-07-13 [email protected] Roll Dart SDK from 8f8f281ccdc6 to f499e91e8cb2 (3 revisions) (flutter/engine#43623) 2023-07-13 [email protected] Roll Fuchsia Mac SDK from 0fvk838jTDNQ_l43k... to 3C7P0w8ySmtqpyi3S... (flutter/engine#43622) 2023-07-13 [email protected] Roll Skia from bedc92598644 to 6ed93436d57c (3 revisions) (flutter/engine#43621) 2023-07-13 [email protected] [Impeller] Add support to embedder for Impeller on GL (via Angle on Windows). (flutter/engine#43388) 2023-07-12 [email protected] [Impeller] Allocate buffers out of a pool on the raster thread. (flutter/engine#43564) 2023-07-12 [email protected] Roll Skia from 4e989b1564ee to bedc92598644 (1 revision) (flutter/engine#43617) 2023-07-12 [email protected] move rtree and canvas_spy sources to Fuchsia sub-directory (flutter/engine#43615) 2023-07-12 [email protected] Roll Skia from 68e3c0b3eea7 to 4e989b1564ee (6 revisions) (flutter/engine#43614) 2023-07-12 [email protected] Document (and assert) that channel names can't contains nulls (flutter/engine#43593) 2023-07-12 [email protected] Reland "Refactor JSNumber.toDart and Object.toJS" (flutter/engine#43363) 2023-07-12 [email protected] Add a flag to `ParagraphBuilder` for rounding hack migration (flutter/engine#43118) 2023-07-12 [email protected] [Impeller] Fixes for asymmetric stencil descriptors (flutter/engine#43535) 2023-07-12 [email protected] Roll Skia from adeeb8d50f7c to 68e3c0b3eea7 (1 revision) (flutter/engine#43609) 2023-07-12 [email protected] Add comment to use of 3x3 mapRect in TransformLayer (flutter/engine#43608) 2023-07-12 [email protected] Roll Skia from a251a36ea519 to adeeb8d50f7c (1 revision) (flutter/engine#43606) 2023-07-12 [email protected] Roll Dart SDK from b95f6531c726 to 8f8f281ccdc6 (2 revisions) (flutter/engine#43607) 2023-07-12 [email protected] Roll Skia from ebc149cff431 to a251a36ea519 (2 revisions) (flutter/engine#43604) 2023-07-12 [email protected] [Impeller] Use new SkParagraph APIs for stroked text. (flutter/engine#41735) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 1STsUj0X5Ygp to xBJq6PsO5ebb fuchsia/sdk/core/mac-amd64 from 0fvk838jTDNQ to 3C7P0w8ySmtq If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md ...

…lutter#130458) flutter/engine@16e2ab7...1b1ccdd 2023-07-12 [email protected] Roll Skia from 4e989b1564ee to bedc92598644 (1 revision) (flutter/engine#43617) 2023-07-12 [email protected] move rtree and canvas_spy sources to Fuchsia sub-directory (flutter/engine#43615) 2023-07-12 [email protected] Roll Skia from 68e3c0b3eea7 to 4e989b1564ee (6 revisions) (flutter/engine#43614) 2023-07-12 [email protected] Document (and assert) that channel names can't contains nulls (flutter/engine#43593) 2023-07-12 [email protected] Reland "Refactor JSNumber.toDart and Object.toJS" (flutter/engine#43363) 2023-07-12 [email protected] Add a flag to `ParagraphBuilder` for rounding hack migration (flutter/engine#43118) 2023-07-12 [email protected] [Impeller] Fixes for asymmetric stencil descriptors (flutter/engine#43535) 2023-07-12 [email protected] Roll Skia from adeeb8d50f7c to 68e3c0b3eea7 (1 revision) (flutter/engine#43609) 2023-07-12 [email protected] Add comment to use of 3x3 mapRect in TransformLayer (flutter/engine#43608) 2023-07-12 [email protected] Roll Skia from a251a36ea519 to adeeb8d50f7c (1 revision) (flutter/engine#43606) 2023-07-12 [email protected] Roll Dart SDK from b95f6531c726 to 8f8f281ccdc6 (2 revisions) (flutter/engine#43607) 2023-07-12 [email protected] Roll Skia from ebc149cff431 to a251a36ea519 (2 revisions) (flutter/engine#43604) 2023-07-12 [email protected] [Impeller] Use new SkParagraph APIs for stroked text. (flutter/engine#41735) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…lutter#130496) Roll Flutter Engine from 16e2ab7e986c to b4080361f2f9 (28 revisions) flutter/engine@16e2ab7...b408036 2023-07-13 [email protected] Roll Skia from e5ec341bc3ca to 56b68ce6196c (1 revision) (flutter/engine#43633) 2023-07-13 [email protected] Roll Dart SDK from f499e91e8cb2 to ade4dae923f3 (1 revision) (flutter/engine#43632) 2023-07-13 [email protected] Roll Skia from 811b046c673b to e5ec341bc3ca (1 revision) (flutter/engine#43631) 2023-07-13 [email protected] Make GOMA state automatic by default (flutter/engine#43584) 2023-07-13 [email protected] Roll Skia from c8da0c657c4e to 811b046c673b (3 revisions) (flutter/engine#43630) 2023-07-13 [email protected] [Impeller] Remove unactionable error logs and use structure chains for instance creation. (flutter/engine#43629) 2023-07-13 [email protected] Roll Skia from 7f391ea9164e to c8da0c657c4e (1 revision) (flutter/engine#43628) 2023-07-13 [email protected] [Impeller] Add RAII wrappers for VMA objects. (flutter/engine#43626) 2023-07-13 [email protected] Roll Fuchsia Linux SDK from 1STsUj0X5YgpiSNEb... to xBJq6PsO5ebblODMe... (flutter/engine#43627) 2023-07-13 [email protected] Roll Skia from 6ed93436d57c to 7f391ea9164e (1 revision) (flutter/engine#43625) 2023-07-13 [email protected] Roll Dart SDK from 8f8f281ccdc6 to f499e91e8cb2 (3 revisions) (flutter/engine#43623) 2023-07-13 [email protected] Roll Fuchsia Mac SDK from 0fvk838jTDNQ_l43k... to 3C7P0w8ySmtqpyi3S... (flutter/engine#43622) 2023-07-13 [email protected] Roll Skia from bedc92598644 to 6ed93436d57c (3 revisions) (flutter/engine#43621) 2023-07-13 [email protected] [Impeller] Add support to embedder for Impeller on GL (via Angle on Windows). (flutter/engine#43388) 2023-07-12 [email protected] [Impeller] Allocate buffers out of a pool on the raster thread. (flutter/engine#43564) 2023-07-12 [email protected] Roll Skia from 4e989b1564ee to bedc92598644 (1 revision) (flutter/engine#43617) 2023-07-12 [email protected] move rtree and canvas_spy sources to Fuchsia sub-directory (flutter/engine#43615) 2023-07-12 [email protected] Roll Skia from 68e3c0b3eea7 to 4e989b1564ee (6 revisions) (flutter/engine#43614) 2023-07-12 [email protected] Document (and assert) that channel names can't contains nulls (flutter/engine#43593) 2023-07-12 [email protected] Reland "Refactor JSNumber.toDart and Object.toJS" (flutter/engine#43363) 2023-07-12 [email protected] Add a flag to `ParagraphBuilder` for rounding hack migration (flutter/engine#43118) 2023-07-12 [email protected] [Impeller] Fixes for asymmetric stencil descriptors (flutter/engine#43535) 2023-07-12 [email protected] Roll Skia from adeeb8d50f7c to 68e3c0b3eea7 (1 revision) (flutter/engine#43609) 2023-07-12 [email protected] Add comment to use of 3x3 mapRect in TransformLayer (flutter/engine#43608) 2023-07-12 [email protected] Roll Skia from a251a36ea519 to adeeb8d50f7c (1 revision) (flutter/engine#43606) 2023-07-12 [email protected] Roll Dart SDK from b95f6531c726 to 8f8f281ccdc6 (2 revisions) (flutter/engine#43607) 2023-07-12 [email protected] Roll Skia from ebc149cff431 to a251a36ea519 (2 revisions) (flutter/engine#43604) 2023-07-12 [email protected] [Impeller] Use new SkParagraph APIs for stroked text. (flutter/engine#41735) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 1STsUj0X5Ygp to xBJq6PsO5ebb fuchsia/sdk/core/mac-amd64 from 0fvk838jTDNQ to 3C7P0w8ySmtq If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md ...

~~Requires https://skia-review.googlesource.com/c/skia/+/692196~~ Landed Fixes flutter/flutter#126010 Looks correct on iOS, renders incorrectly on Android ð�¤· . Might be related to all of our text bounds looking off. ### iOS ![flutter_03](https://github.com/flutter/engine/assets/8975114/50897fd0-47fd-4cad-b158-1662aa650092) ### Android ![flutter_04](https://github.com/flutter/engine/assets/8975114/bcefe843-71a0-4b98-956f-039918e9a4cc)

[Impeller][WIP] Use new SkParagraph APIs for stroked text

d905708

chinmaygarde assigned jonahwilliams May 5, 2023

chinmaygarde added the e: impeller label May 5, 2023

chinmaygarde changed the title ~~[Impeller][WIP] Use new SkParagraph APIs for stroked text~~ [Impeller][WIP] Use new SkParagraph APIs for stroked text. May 18, 2023

jonahwilliams added 2 commits July 10, 2023 16:36

Merge branch 'main' of github.com:flutter/engine into stroked_text_12…

a47bdc0

…31322

update

8a3a522

jonahwilliams marked this pull request as ready for review July 11, 2023 02:51

jonahwilliams requested review from bdero, chinmaygarde and dnfield July 11, 2023 02:56

jonahwilliams changed the title ~~[Impeller][WIP] Use new SkParagraph APIs for stroked text.~~ [Impeller] Use new SkParagraph APIs for stroked text. Jul 11, 2023

jonahwilliams changed the title ~~[Impeller] Use new SkParagraph APIs for stroked text.~~ [Impeller][WIP] Use new SkParagraph APIs for stroked text. Jul 11, 2023

Merge branch 'main' of github.com:flutter/engine into stroked_text_12…

7831afd

…31322

jonahwilliams changed the title ~~[Impeller][WIP] Use new SkParagraph APIs for stroked text.~~ [Impeller] Use new SkParagraph APIs for stroked text. Jul 11, 2023

bdero approved these changes Jul 11, 2023

View reviewed changes

add test

ef55319

jonahwilliams added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 12, 2023

auto-submit bot merged commit a4f5264 into flutter:main Jul 12, 2023

engine-flutter-autoroll mentioned this pull request Jul 12, 2023

Roll Flutter Engine from 16e2ab7e986c to 28edc38291d9 (2 revisions) flutter/flutter#130426

Closed

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

cefb60e

…ter/engine#41735)

engine-flutter-autoroll mentioned this pull request Jul 12, 2023

Roll Flutter Engine from 16e2ab7e986c to 257bb8d88df7 (4 revisions) flutter/flutter#130429

Closed

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

801cdbd

…ter/engine#41735)

engine-flutter-autoroll mentioned this pull request Jul 12, 2023

Roll Flutter Engine from 16e2ab7e986c to e1b1aae765aa (6 revisions) flutter/flutter#130441

Closed

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

ab22504

…ter/engine#41735)

engine-flutter-autoroll mentioned this pull request Jul 12, 2023

Roll Flutter Engine from 16e2ab7e986c to f55f087a12b5 (8 revisions) flutter/flutter#130443

Closed

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

5879305

…ter/engine#41735)

engine-flutter-autoroll mentioned this pull request Jul 12, 2023

Roll Flutter Engine from 16e2ab7e986c to 1b1ccdd1f527 (13 revisions) flutter/flutter#130458

Merged

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

ead75ff

…ter/engine#41735)

engine-flutter-autoroll mentioned this pull request Jul 13, 2023

Roll Flutter Engine from 16e2ab7e986c to b4080361f2f9 (28 revisions) flutter/flutter#130496

Merged

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

a4f5264e0 [Impeller] Use new SkParagraph APIs for stroked text. (flut…

f9246a8

…ter/engine#41735)

This was referenced Jul 13, 2023

[Impeller] Vulkan: Top line of text is cropped sometimes in wonderous app flutter/flutter#128624

Closed

[Impeller] TextDecoration dashed and dotted are rendering as solid. flutter/flutter#126673

Closed

jonahwilliams deleted the stroked_text_1231322 branch July 13, 2023 18:33

LeoSandbox mentioned this pull request Aug 23, 2023

[Impeller] PaintingStyle.stroke for Text: Rendered text has an offset flutter/flutter#133157

Closed

2 tasks

[Impeller] Use new SkParagraph APIs for stroked text. #41735

[Impeller] Use new SkParagraph APIs for stroked text. #41735

Uh oh!

Conversation

jonahwilliams commented May 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

iOS

Android

Uh oh!

flutter-dashboard bot commented Jul 11, 2023

Uh oh!

jonahwilliams commented Jul 11, 2023

Uh oh!

chinmaygarde commented Jul 11, 2023

Uh oh!

jonahwilliams commented Jul 11, 2023

Uh oh!

bdero left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jonahwilliams commented May 4, 2023 •

edited

Loading