Let pushColorFilter accept all types of ColorFilters #9641

dnfield · 2019-07-01T23:06:41Z

Fixes flutter/flutter#35415

This allows consumers to apply all supported types of color filters to a scene.

This is a breaking change, but we don't actually use this code anywhere in the framework so I expect this code to pass.

Breaking change announcement: https://groups.google.com/forum/#!topic/flutter-announce/bdhRbfwg6jA

dnfield · 2019-07-01T23:52:55Z

This has at least one bug in it right now that I'm working on... crashes when you pass it a matrix.

dnfield · 2019-07-02T15:38:56Z

This should be good now. Will have tests upstream in framework.

liyuqian · 2019-07-02T23:38:32Z

lib/ui/compositing.dart

+      default:
+        assert(false);
+    }
+    final ColorFilterEngineLayer layer = ColorFilterEngineLayer._(engineLayer);
    assert(_debugPushLayer(layer));
    return layer;
  }
  EngineLayer _pushColorFilter(int color, int blendMode) native 'SceneBuilder_pushColorFilter';


Instead of implementing 4 pushColorFilter variants, maybe it's cleaner to define a single pushColorFilter that takes a sk_sp<SkColorFilter>, and expose ExtractColorFilter from paint.cc to generate the SkColorFilter.

My concern with that is the Paint version is a bit hacky and was mainly done to maintain backwards compatibility.

Paint can afford to do this because it already encodes/serializes this data to the engine side. Doing that is not free. I'd rather use this approach because it avoids allocating unnecessary typed data (which is demonstrably slow), and avoids sending data over to thenative side that we don't need.

Thanks for pointing that out! I didn't realize that ColorFilter doesn't have a corresponding native SkColorFilter object. Is it possible to create such a native object during the construction of ColorFilter, so Paint can just store it inside _objects (like how Shader is stored), and pushColorFilter can also directly use it without triggering additional Dart to native conversion costs?

I guess that I'm Ok with having 4 pushColorFilter*** in scene_builder.cc but it just feels a little weird as every previous push*** in scene_builder.cc has a one-to-one relationship with the SceneBuilder.push*** in compositing.dart. I'll consult @chinmaygarde and @yjbanov to see how they feel about 4 pushColorFilter*** variants in scene_builder.cc.

That may be a better way to go - just make ColorFilter a NativeFieldWrapper2 class. Do you want that to be part of this pull request or should we split it out?

Let's have it here if it's not complicating this PR too much :) (I was hoping that it could even simplify this PR a little bit.)

I split that effort out into #9668 which has landed and been merged into this PR. PTAL.

liyuqian · 2019-07-02T23:45:49Z

testing/dart/compositing_test.dart

@@ -274,7 +274,13 @@ void main() {
      return builder.pushOpacity(100, oldLayer: oldLayer);
    });
    testNoSharing((SceneBuilder builder, EngineLayer oldLayer) {
-      return builder.pushColorFilter(const Color.fromARGB(0, 0, 0, 0), BlendMode.color, oldLayer: oldLayer);
+      return builder.pushColorFilter(


Let's add test coverage for all 4 types of ColorFilters. I think they don't have to be put in the SceneBuilder does not share a layer between addRetained and push* test. Maybe just add a new test pushColorFilter handles all 4 types?

liyuqian

LGTM

…/engine#9641)

flutter/engine@75387db...49445ce git log 75387db..49445ce --no-merges --oneline 49445ce FLEViewController/Engine API changes (flutter/engine#9750) 2a79462 Add Fuchsia build CI presubmit steps (flutter/engine#9736) 67cebdb Roll fuchsia/sdk/core/linux-amd64 from KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC to ehWVT9QJbC-vFMM6SkkQM9HJ9oITFCws7FC9JnrFq2gC (flutter/engine#9765) 089c740 Roll fuchsia/sdk/core/mac-amd64 from lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C to EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C (flutter/engine#9759) b22410e Include SkParagraph headers only when the enable-skshaper flag is on (flutter/engine#9758) 2cd650d Minimal integration with the Skia text shaper module (flutter/engine#9556) f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466) aca0482 Make all shell unit tests use the OpenGL rasterizer. (flutter/engine#9746) bc57291 Make FLEViewController's view an internal detail (flutter/engine#9741) 9776043 Synchronize main thread and gpu thread for first render frame (flutter/engine#9506) f600ae8 Use libc++ variant of string view and remove the FML variant. (flutter/engine#9737) 564f53f Revert "Improve caching limits for Skia (#9503)" (flutter/engine#9740) b453d3c libtxt: fix reference counting of SkFontStyleSets held by font asset providers (flutter/engine#9561) fa7627d Fix backspace crash on Chinese devices (flutter/engine#9734) 56885f7 Let pushColorFilter accept all types of ColorFilters (flutter/engine#9641) 6dccb21 Roll src/third_party/skia 96fdfe0fe88e..af4e7b6cf616 (1 commits) (flutter/engine#9735) 8511d9b Roll fuchsia/sdk/core/mac-amd64 from byM-kyxL4bemlTYNqhKUfJfZoIUrCSzS6XzsFr4n9-MC to lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C (flutter/engine#9742) b3bf0a1 Roll fuchsia/sdk/core/linux-amd64 from I2Qe1zxgckzIzMBTztvzeWYsDgcb9Fw-idSI16oIlx8C to KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC (flutter/engine#9743) 7e56823 Fix windows test by not attempting to open a directory as a file. (flutter/engine#9745) 6cf0d13 Roll src/third_party/skia a3ffaabcc4f2..96fdfe0fe88e (5 commits) (flutter/engine#9731) 49a00ae Fix Fuchsia build. (flutter/engine#9730) b3bb39b Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 (flutter/engine#9728) 2284210 Make the license script compatible with recently changed Dart I/O stream APIs (flutter/engine#9725) ad582b5 Rework image & texture management to use concurrent message queues. (flutter/engine#9486) 1dcd5f5 Roll src/third_party/skia 6b82cf638682..a3ffaabcc4f2 (24 commits) (flutter/engine#9726) 129979c Revert "Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)" (flutter/engine#9724) 8020d7e Roll src/third_party/skia 56065d9b875f..6b82cf638682 (3 commits) (flutter/engine#9718) e24bd78 Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits) 3d2668c Reland isolate group changes 802bd15 iOS platform view opacity (flutter/engine#9667) 3b6265b Roll src/third_party/dart b5aeaa6796..06c3d7ad3a (44 commits) 887e052 Refactor ColorFilter to have a native wrapper (flutter/engine#9668) The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff ([email protected]), and stop the roller if necessary.

flutter/engine@75387db...49445ce git log 75387db..49445ce --no-merges --oneline 49445ce FLEViewController/Engine API changes (flutter/engine#9750) 2a79462 Add Fuchsia build CI presubmit steps (flutter/engine#9736) 67cebdb Roll fuchsia/sdk/core/linux-amd64 from KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC to ehWVT9QJbC-vFMM6SkkQM9HJ9oITFCws7FC9JnrFq2gC (flutter/engine#9765) 089c740 Roll fuchsia/sdk/core/mac-amd64 from lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C to EYnRdXFT9l-d8Qkz4zeTRXnqfV3KQzpQhoPs1r0-740C (flutter/engine#9759) b22410e Include SkParagraph headers only when the enable-skshaper flag is on (flutter/engine#9758) 2cd650d Minimal integration with the Skia text shaper module (flutter/engine#9556) f775f5e Re-enable the Wuffs GIF decoder (flutter/engine#9466) aca0482 Make all shell unit tests use the OpenGL rasterizer. (flutter/engine#9746) bc57291 Make FLEViewController&flutter#39;s view an internal detail (flutter/engine#9741) 9776043 Synchronize main thread and gpu thread for first render frame (flutter/engine#9506) f600ae8 Use libc&flutter#43;&flutter#43; variant of string view and remove the FML variant. (flutter/engine#9737) 564f53f Revert &flutter#34;Improve caching limits for Skia (flutter#9503)&flutter#34; (flutter/engine#9740) b453d3c libtxt: fix reference counting of SkFontStyleSets held by font asset providers (flutter/engine#9561) fa7627d Fix backspace crash on Chinese devices (flutter/engine#9734) 56885f7 Let pushColorFilter accept all types of ColorFilters (flutter/engine#9641) 6dccb21 Roll src/third_party/skia 96fdfe0fe88e..af4e7b6cf616 (1 commits) (flutter/engine#9735) 8511d9b Roll fuchsia/sdk/core/mac-amd64 from byM-kyxL4bemlTYNqhKUfJfZoIUrCSzS6XzsFr4n9-MC to lCQWEeR_Ert7t_qAbMRycwrRyZC-dIprYPyPJzwPmg4C (flutter/engine#9742) b3bf0a1 Roll fuchsia/sdk/core/linux-amd64 from I2Qe1zxgckzIzMBTztvzeWYsDgcb9Fw-idSI16oIlx8C to KGmm_RIJoXS19zTm2crjM3RYpmp5Y03-fLUeVdylbTYC (flutter/engine#9743) 7e56823 Fix windows test by not attempting to open a directory as a file. (flutter/engine#9745) 6cf0d13 Roll src/third_party/skia a3ffaabcc4f2..96fdfe0fe88e (5 commits) (flutter/engine#9731) 49a00ae Fix Fuchsia build. (flutter/engine#9730) b3bb39b Roll src/third_party/dart 06c3d7ad3a...09fc76bc51 (flutter/engine#9728) 2284210 Make the license script compatible with recently changed Dart I/O stream APIs (flutter/engine#9725) ad582b5 Rework image & texture management to use concurrent message queues. (flutter/engine#9486) 1dcd5f5 Roll src/third_party/skia 6b82cf638682..a3ffaabcc4f2 (24 commits) (flutter/engine#9726) 129979c Revert &flutter#34;Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits)&flutter#34; (flutter/engine#9724) 8020d7e Roll src/third_party/skia 56065d9b875f..6b82cf638682 (3 commits) (flutter/engine#9718) e24bd78 Roll src/third_party/dart 06c3d7ad3a..7acecda2cc (12 commits) 3d2668c Reland isolate group changes 802bd15 iOS platform view opacity (flutter/engine#9667) 3b6265b Roll src/third_party/dart b5aeaa6796..06c3d7ad3a (44 commits) 887e052 Refactor ColorFilter to have a native wrapper (flutter/engine#9668) The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff ([email protected]), and stop the roller if necessary.

Let pushColorFilter accept all types of ColorFilters

5af08d0

dnfield requested review from chinmaygarde, yjbanov and liyuqian July 1, 2019 23:06

googlebot added the cla: yes label Jul 1, 2019

dnfield added 3 commits July 1, 2019 17:30

release typed data, check matrix len

059bf04

20 entries, not 25

b7b4aa8

20 entries, not 25

a1e9319

dnfield mentioned this pull request Jul 2, 2019

Add colorFilterLayer/Widget flutter/flutter#35468

Merged

9 tasks

move const to right spot

ed6fa6d

liyuqian reviewed Jul 2, 2019

View reviewed changes

dnfield added 2 commits July 2, 2019 18:57

tests

a3b9075

Refactor ColorFilter to have a native wrapper

ff4ed6b

dnfield mentioned this pull request Jul 3, 2019

Refactor ColorFilter to have a native wrapper #9668

Merged

dnfield added 11 commits July 3, 2019 16:02

comment

4b820ed

tests

8935830

typo

1bfc97c

merge

919f2d3

Merge remote-tracking branch 'upstream/master' into push_color_filter

529803d

merge

f10ecfd

Merge remote-tracking branch 'upstream/master' into native_color_filter

c8a8c35

Use right accessor

884f0e3

Merge branch 'native_color_filter' into push_color_filter

c6f3421

merge

9f132cf

merge!

b6a06a9

dnfield force-pushed the push_color_filter branch from a226e13 to 882ca85 Compare July 8, 2019 23:13

remove dead code

75a88a5

dnfield force-pushed the push_color_filter branch from 882ca85 to 75a88a5 Compare July 8, 2019 23:14

liyuqian approved these changes Jul 10, 2019

View reviewed changes

dnfield merged commit 56885f7 into flutter:master Jul 10, 2019

dnfield deleted the push_color_filter branch July 10, 2019 19:07

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

5f6946d

…/engine#9641)

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

Roll engine 75387dbc147d..b453d3c3ddcb (20 commits) flutter/flutter#35908

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

5597b9c

…/engine#9641)

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

Roll engine 75387dbc147d..f600ae830d6c (22 commits) flutter/flutter#35916

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

9adcc2b

…/engine#9641)

This was referenced Jul 10, 2019

Roll engine 75387dbc147d..9776043ea505 (23 commits) flutter/flutter#35922

Closed

Roll engine 75387dbc147d..bc57291ff44f (24 commits) flutter/flutter#35925

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

071644b

…/engine#9641)

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

Roll engine 75387dbc147d..f775f5e4d637 (26 commits) flutter/flutter#35930

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

db1c612

…/engine#9641)

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

Roll engine 75387dbc147d..b22410ef6b11 (28 commits) flutter/flutter#35944

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

b756581

…/engine#9641)

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

9a8f1dd

…/engine#9641)

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

Roll engine 75387dbc147d..089c740841e8 (29 commits) flutter/flutter#35947

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

0b82f4e

…/engine#9641)

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

Roll engine 75387dbc147d..67cebdb926a4 (30 commits) flutter/flutter#35949

Closed

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

56885f7 Let pushColorFilter accept all types of ColorFilters (flutter…

e859718

…/engine#9641)

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

Roll engine 75387dbc147d..49445ce4949b (32 commits) flutter/flutter#35952

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Let pushColorFilter accept all types of ColorFilters #9641

Let pushColorFilter accept all types of ColorFilters #9641

dnfield commented Jul 1, 2019

dnfield commented Jul 1, 2019

dnfield commented Jul 2, 2019

liyuqian Jul 2, 2019 •

edited

Loading

dnfield Jul 3, 2019 •

edited

Loading

liyuqian Jul 3, 2019

dnfield Jul 3, 2019

liyuqian Jul 3, 2019

dnfield Jul 8, 2019

liyuqian Jul 2, 2019

dnfield Jul 3, 2019

liyuqian left a comment

Let pushColorFilter accept all types of ColorFilters #9641

Let pushColorFilter accept all types of ColorFilters #9641

Conversation

dnfield commented Jul 1, 2019

dnfield commented Jul 1, 2019

dnfield commented Jul 2, 2019

liyuqian Jul 2, 2019 • edited Loading

Choose a reason for hiding this comment

dnfield Jul 3, 2019 • edited Loading

Choose a reason for hiding this comment

liyuqian Jul 3, 2019

Choose a reason for hiding this comment

dnfield Jul 3, 2019

Choose a reason for hiding this comment

liyuqian Jul 3, 2019

Choose a reason for hiding this comment

dnfield Jul 8, 2019

Choose a reason for hiding this comment

liyuqian Jul 2, 2019

Choose a reason for hiding this comment

dnfield Jul 3, 2019

Choose a reason for hiding this comment

liyuqian left a comment

Choose a reason for hiding this comment

liyuqian Jul 2, 2019 •

edited

Loading

dnfield Jul 3, 2019 •

edited

Loading