Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit ce688af

Browse files
author
Jonah Williams
authored
Merge branch 'main' into stencil_formats
2 parents b6bdd7d + bc28b67 commit ce688af

File tree

115 files changed

+2319
-610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2319
-610
lines changed

‎DEPS‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'bf6019be75efeee2a6a2aa862bfebc297b449786',
21+
'skia_revision': '76898dad9fda119aa14b05fba18d32965c54015e',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': '3ebf0fedfcebbaffb4397c88f041bc95a1a3912b',
56+
'dart_revision': 'ab417bc74bb1a81acbb3b981d440d4bfe68f5051',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -214,6 +214,7 @@ vars = {
214214
"upstream_sqlite": "https://github.com/sqlite/sqlite.git",
215215
"upstream_sse": "https://github.com/dart-lang/sse.git",
216216
"upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git",
217+
"upstream_stb": "https://github.com/nothings/stb.git",
217218
"upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git",
218219
"upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git",
219220
"upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
@@ -257,7 +258,7 @@ allowed_hosts = [
257258
]
258259

259260
deps = {
260-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a067408d923ccf80742571bb7a71705499f5779e',
261+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f91786b0f7ed84f4d55fef7707b68bea180281f5',
261262

262263
# Fuchsia compatibility
263264
#
@@ -681,6 +682,9 @@ deps = {
681682
'src/third_party/json':
682683
Var('github_git') + '/nlohmann/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
683684

685+
'src/third_party/stb':
686+
Var('github_git') + '/nothings/stb.git' + '@' + '5736b15f7ea0ffb08dd38af21067c314d6a3aae9',
687+
684688
'src/third_party/gradle': {
685689
'packages': [
686690
{
@@ -884,7 +888,7 @@ deps = {
884888
'packages': [
885889
{
886890
'package': 'fuchsia/sdk/core/mac-amd64',
887-
'version': 'G25oJMO5jbUi-UN4FM1owc2acv-i0u7MdKqblmI-czMC'
891+
'version': 'vJ6oaubpqgRM2nb1e_i0xzq5u59ChjEAmndn9yPIFiUC'
888892
}
889893
],
890894
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -894,7 +898,7 @@ deps = {
894898
'packages': [
895899
{
896900
'package': 'fuchsia/sdk/core/linux-amd64',
897-
'version': 'kKI09su99b0AKs8b3VKTzXDVmeTaKm7ye2chxl9BE0EC'
901+
'version': '-HcyJtxGxUDcqX-joRgopminL0PbfzDP9E1TMp9xBSgC'
898902
}
899903
],
900904
'condition': 'host_os == "linux" and not download_fuchsia_sdk',

‎ci/licenses_golden/excluded_files‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,6 +2670,7 @@
26702670
../../../third_party/skia/include/gpu/ganesh/BUILD.bazel
26712671
../../../third_party/skia/include/gpu/ganesh/gl/BUILD.bazel
26722672
../../../third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel
2673+
../../../third_party/skia/include/gpu/ganesh/vk/BUILD.bazel
26732674
../../../third_party/skia/include/gpu/gl/BUILD.bazel
26742675
../../../third_party/skia/include/gpu/gl/egl/BUILD.bazel
26752676
../../../third_party/skia/include/gpu/gl/glx/BUILD.bazel
@@ -2890,6 +2891,7 @@
28902891
../../../third_party/sqlite/Makefile
28912892
../../../third_party/sqlite/README.md
28922893
../../../third_party/sqlite/VERSION
2894+
../../../third_party/stb
28932895
../../../third_party/swiftshader
28942896
../../../third_party/tinygltf
28952897
../../../third_party/vulkan-deps/.git

‎ci/licenses_golden/licenses_dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 1e850cb6cd4de368cc26a62d37a6a14e
1+
Signature: 444bc549b7c72a33277494f816ccdd8d
22

33
====================================================================================================
44
LIBRARY: dart

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,12 +1701,22 @@ ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.cc + ../../../flutter/LICE
17011701
ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.h + ../../../flutter/LICENSE
17021702
ORIGIN: ../../../flutter/impeller/toolkit/gles/gles.h + ../../../flutter/LICENSE
17031703
ORIGIN: ../../../flutter/impeller/toolkit/gles/texture.h + ../../../flutter/LICENSE
1704+
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc + ../../../flutter/LICENSE
1705+
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h + ../../../flutter/LICENSE
17041706
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc + ../../../flutter/LICENSE
17051707
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h + ../../../flutter/LICENSE
1706-
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.cc + ../../../flutter/LICENSE
1707-
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.h + ../../../flutter/LICENSE
17081708
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc + ../../../flutter/LICENSE
17091709
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.h + ../../../flutter/LICENSE
1710+
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.cc + ../../../flutter/LICENSE
1711+
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.h + ../../../flutter/LICENSE
1712+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc + ../../../flutter/LICENSE
1713+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.h + ../../../flutter/LICENSE
1714+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.cc + ../../../flutter/LICENSE
1715+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.h + ../../../flutter/LICENSE
1716+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.cc + ../../../flutter/LICENSE
1717+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.h + ../../../flutter/LICENSE
1718+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.cc + ../../../flutter/LICENSE
1719+
ORIGIN: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.h + ../../../flutter/LICENSE
17101720
ORIGIN: ../../../flutter/impeller/typographer/font.cc + ../../../flutter/LICENSE
17111721
ORIGIN: ../../../flutter/impeller/typographer/font.h + ../../../flutter/LICENSE
17121722
ORIGIN: ../../../flutter/impeller/typographer/font_glyph_pair.cc + ../../../flutter/LICENSE
@@ -1721,17 +1731,20 @@ ORIGIN: ../../../flutter/impeller/typographer/rectangle_packer.cc + ../../../flu
17211731
ORIGIN: ../../../flutter/impeller/typographer/rectangle_packer.h + ../../../flutter/LICENSE
17221732
ORIGIN: ../../../flutter/impeller/typographer/text_frame.cc + ../../../flutter/LICENSE
17231733
ORIGIN: ../../../flutter/impeller/typographer/text_frame.h + ../../../flutter/LICENSE
1724-
ORIGIN: ../../../flutter/impeller/typographer/text_render_context.cc + ../../../flutter/LICENSE
1725-
ORIGIN: ../../../flutter/impeller/typographer/text_render_context.h + ../../../flutter/LICENSE
17261734
ORIGIN: ../../../flutter/impeller/typographer/text_run.cc + ../../../flutter/LICENSE
17271735
ORIGIN: ../../../flutter/impeller/typographer/text_run.h + ../../../flutter/LICENSE
17281736
ORIGIN: ../../../flutter/impeller/typographer/typeface.cc + ../../../flutter/LICENSE
17291737
ORIGIN: ../../../flutter/impeller/typographer/typeface.h + ../../../flutter/LICENSE
1738+
ORIGIN: ../../../flutter/impeller/typographer/typographer_context.cc + ../../../flutter/LICENSE
1739+
ORIGIN: ../../../flutter/impeller/typographer/typographer_context.h + ../../../flutter/LICENSE
17301740
ORIGIN: ../../../flutter/lib/gpu/context.cc + ../../../flutter/LICENSE
17311741
ORIGIN: ../../../flutter/lib/gpu/context.h + ../../../flutter/LICENSE
17321742
ORIGIN: ../../../flutter/lib/gpu/export.cc + ../../../flutter/LICENSE
17331743
ORIGIN: ../../../flutter/lib/gpu/export.h + ../../../flutter/LICENSE
1744+
ORIGIN: ../../../flutter/lib/gpu/host_buffer.cc + ../../../flutter/LICENSE
1745+
ORIGIN: ../../../flutter/lib/gpu/host_buffer.h + ../../../flutter/LICENSE
17341746
ORIGIN: ../../../flutter/lib/gpu/lib/gpu.dart + ../../../flutter/LICENSE
1747+
ORIGIN: ../../../flutter/lib/gpu/lib/src/buffer.dart + ../../../flutter/LICENSE
17351748
ORIGIN: ../../../flutter/lib/gpu/lib/src/context.dart + ../../../flutter/LICENSE
17361749
ORIGIN: ../../../flutter/lib/gpu/lib/src/smoketest.dart + ../../../flutter/LICENSE
17371750
ORIGIN: ../../../flutter/lib/gpu/smoketest.cc + ../../../flutter/LICENSE
@@ -1869,10 +1882,12 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
18691882
ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
18701883
ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
18711884
ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
1885+
ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
18721886
ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
18731887
ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
18741888
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
18751889
ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.h + ../../../flutter/LICENSE
1890+
ORIGIN: ../../../flutter/lib/ui/text/text_box.h + ../../../flutter/LICENSE
18761891
ORIGIN: ../../../flutter/lib/ui/ui.dart + ../../../flutter/LICENSE
18771892
ORIGIN: ../../../flutter/lib/ui/ui_benchmarks.cc + ../../../flutter/LICENSE
18781893
ORIGIN: ../../../flutter/lib/ui/ui_dart_state.cc + ../../../flutter/LICENSE
@@ -4427,12 +4442,22 @@ FILE: ../../../flutter/impeller/toolkit/gles/gles.h
44274442
FILE: ../../../flutter/impeller/toolkit/gles/texture.cc
44284443
FILE: ../../../flutter/impeller/toolkit/gles/texture.h
44294444
FILE: ../../../flutter/impeller/tools/malioc.json
4445+
FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
4446+
FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h
44304447
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc
44314448
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h
4432-
FILE: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.cc
4433-
FILE: ../../../flutter/impeller/typographer/backends/skia/text_render_context_skia.h
44344449
FILE: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc
44354450
FILE: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.h
4451+
FILE: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.cc
4452+
FILE: ../../../flutter/impeller/typographer/backends/skia/typographer_context_skia.h
4453+
FILE: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.cc
4454+
FILE: ../../../flutter/impeller/typographer/backends/stb/glyph_atlas_context_stb.h
4455+
FILE: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.cc
4456+
FILE: ../../../flutter/impeller/typographer/backends/stb/text_frame_stb.h
4457+
FILE: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.cc
4458+
FILE: ../../../flutter/impeller/typographer/backends/stb/typeface_stb.h
4459+
FILE: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.cc
4460+
FILE: ../../../flutter/impeller/typographer/backends/stb/typographer_context_stb.h
44364461
FILE: ../../../flutter/impeller/typographer/font.cc
44374462
FILE: ../../../flutter/impeller/typographer/font.h
44384463
FILE: ../../../flutter/impeller/typographer/font_glyph_pair.cc
@@ -4447,17 +4472,20 @@ FILE: ../../../flutter/impeller/typographer/rectangle_packer.cc
44474472
FILE: ../../../flutter/impeller/typographer/rectangle_packer.h
44484473
FILE: ../../../flutter/impeller/typographer/text_frame.cc
44494474
FILE: ../../../flutter/impeller/typographer/text_frame.h
4450-
FILE: ../../../flutter/impeller/typographer/text_render_context.cc
4451-
FILE: ../../../flutter/impeller/typographer/text_render_context.h
44524475
FILE: ../../../flutter/impeller/typographer/text_run.cc
44534476
FILE: ../../../flutter/impeller/typographer/text_run.h
44544477
FILE: ../../../flutter/impeller/typographer/typeface.cc
44554478
FILE: ../../../flutter/impeller/typographer/typeface.h
4479+
FILE: ../../../flutter/impeller/typographer/typographer_context.cc
4480+
FILE: ../../../flutter/impeller/typographer/typographer_context.h
44564481
FILE: ../../../flutter/lib/gpu/context.cc
44574482
FILE: ../../../flutter/lib/gpu/context.h
44584483
FILE: ../../../flutter/lib/gpu/export.cc
44594484
FILE: ../../../flutter/lib/gpu/export.h
4485+
FILE: ../../../flutter/lib/gpu/host_buffer.cc
4486+
FILE: ../../../flutter/lib/gpu/host_buffer.h
44604487
FILE: ../../../flutter/lib/gpu/lib/gpu.dart
4488+
FILE: ../../../flutter/lib/gpu/lib/src/buffer.dart
44614489
FILE: ../../../flutter/lib/gpu/lib/src/context.dart
44624490
FILE: ../../../flutter/lib/gpu/lib/src/smoketest.dart
44634491
FILE: ../../../flutter/lib/gpu/smoketest.cc
@@ -4596,10 +4624,12 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
45964624
FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
45974625
FILE: ../../../flutter/lib/ui/text/font_collection.cc
45984626
FILE: ../../../flutter/lib/ui/text/font_collection.h
4627+
FILE: ../../../flutter/lib/ui/text/line_metrics.h
45994628
FILE: ../../../flutter/lib/ui/text/paragraph.cc
46004629
FILE: ../../../flutter/lib/ui/text/paragraph.h
46014630
FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
46024631
FILE: ../../../flutter/lib/ui/text/paragraph_builder.h
4632+
FILE: ../../../flutter/lib/ui/text/text_box.h
46034633
FILE: ../../../flutter/lib/ui/ui.dart
46044634
FILE: ../../../flutter/lib/ui/ui_benchmarks.cc
46054635
FILE: ../../../flutter/lib/ui/ui_dart_state.cc

‎ci/licenses_golden/licenses_fuchsia‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f5a79e03f71c637e3403cd42714e48b0
1+
Signature: 28811e344a9e1aa24eec9eb03a79e31e
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk

‎ci/licenses_golden/licenses_skia‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 5dad8cab4c7769274c06df254b1bf3cf
1+
Signature: edd1ae502e56b8317e70a6dc5f50f678
22

33
====================================================================================================
44
LIBRARY: etc1
@@ -395,7 +395,6 @@ FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.minified.sksl
395395
FILE: ../../../third_party/skia/src/sksl/generated/sksl_frag.unoptimized.sksl
396396
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.minified.sksl
397397
FILE: ../../../third_party/skia/src/sksl/generated/sksl_gpu.unoptimized.sksl
398-
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.dehydrated.sksl
399398
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.minified.sksl
400399
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_frag.unoptimized.sksl
401400
FILE: ../../../third_party/skia/src/sksl/generated/sksl_graphite_vert.minified.sksl
@@ -8886,6 +8885,7 @@ ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkMeshGanesh.h + ../../../t
88868885
ORIGIN: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h + ../../../third_party/skia/LICENSE
88878886
ORIGIN: ../../../third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h + ../../../third_party/skia/LICENSE
88888887
ORIGIN: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h + ../../../third_party/skia/LICENSE
8888+
ORIGIN: ../../../third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h + ../../../third_party/skia/LICENSE
88898889
ORIGIN: ../../../third_party/skia/include/gpu/graphite/BackendSemaphore.h + ../../../third_party/skia/LICENSE
88908890
ORIGIN: ../../../third_party/skia/include/gpu/graphite/Image.h + ../../../third_party/skia/LICENSE
88918891
ORIGIN: ../../../third_party/skia/include/gpu/graphite/Surface.h + ../../../third_party/skia/LICENSE
@@ -9126,6 +9126,7 @@ FILE: ../../../third_party/skia/include/gpu/ganesh/SkMeshGanesh.h
91269126
FILE: ../../../third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h
91279127
FILE: ../../../third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h
91289128
FILE: ../../../third_party/skia/include/gpu/ganesh/mtl/SkSurfaceMetal.h
9129+
FILE: ../../../third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h
91299130
FILE: ../../../third_party/skia/include/gpu/graphite/BackendSemaphore.h
91309131
FILE: ../../../third_party/skia/include/gpu/graphite/Image.h
91319132
FILE: ../../../third_party/skia/include/gpu/graphite/Surface.h

‎ci/licenses_golden/tool_signature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: d8b5e1bcc7593e590ac227d01043c4a8
1+
Signature: 996bda987bb421e5aecf9238c247c296
22

‎display_list/skia/dl_sk_paint_dispatcher.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void DlSkPaintDispatchHelper::setAntiAlias(bool aa) {
4141
paint_.setAntiAlias(aa);
4242
}
4343
void DlSkPaintDispatchHelper::setDither(bool dither) {
44-
paint_.setDither(dither);
44+
dither_ = dither;
4545
}
4646
void DlSkPaintDispatchHelper::setInvertColors(bool invert) {
4747
invert_colors_ = invert;
@@ -73,6 +73,7 @@ void DlSkPaintDispatchHelper::setBlendMode(DlBlendMode mode) {
7373
paint_.setBlendMode(ToSk(mode));
7474
}
7575
void DlSkPaintDispatchHelper::setColorSource(const DlColorSource* source) {
76+
color_source_gradient_ = source && source->isGradient();
7677
paint_.setShader(ToSk(source));
7778
}
7879
void DlSkPaintDispatchHelper::setImageFilter(const DlImageFilter* filter) {

‎display_list/skia/dl_sk_paint_dispatcher.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,17 @@ class DlSkPaintDispatchHelper : public virtual DlOpReceiver {
3737
void setMaskFilter(const DlMaskFilter* filter) override;
3838
void setImageFilter(const DlImageFilter* filter) override;
3939

40-
const SkPaint& paint() { return paint_; }
40+
const SkPaint& paint() {
41+
// On the Impeller backend, we will only support dithering of *gradients*,
42+
// and it will be enabled by default (without the option to disable it).
43+
// Until Skia support is completely removed, we only want to respect the
44+
// dither flag for gradients (otherwise it will also apply to, for
45+
// example, images, which is not supported in Impeller).
46+
//
47+
// See https://github.com/flutter/flutter/issues/112498.
48+
paint_.setDither(color_source_gradient_ && dither_);
49+
return paint_;
50+
}
4151

4252
/// Returns the current opacity attribute which is used to reduce
4353
/// the alpha of all setColor calls encountered in the streeam
@@ -57,6 +67,8 @@ class DlSkPaintDispatchHelper : public virtual DlOpReceiver {
5767

5868
private:
5969
SkPaint paint_;
70+
bool color_source_gradient_ = false;
71+
bool dither_ = false;
6072
bool invert_colors_ = false;
6173
sk_sp<SkColorFilter> sk_color_filter_;
6274

0 commit comments

Comments
 (0)