Skip to content

Commit

Permalink
Update Skia to 2024-05-13 (2a7830d74a8b596a51a7e5c8eb78243ca4e5faf2)
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=274077

Reviewed by Carlos Garcia Campos.

* Source/ThirdParty/skia/README.WebKit: Update commit.

Contains upstream commits:
git log --oneline --pretty='%h %s' 5b62c0022f92b3fea4fd9b99e1e517fe002cf15a..2a7830d74a8b596a51a7e5c8eb78243ca4e5faf2
2a7830d74a Roll SK Tool from 4910599942c0 to 68c060aa3487
4bc37d0fee Roll Skia Infra from 14a9c90d4ad7 to 4910599942c0 (2 revisions)
cbe627d5ba Roll vulkan-deps from 862e523d9e3d to a06b82c306ee (1 revision)
4e9362762a Roll SK Tool from 54d46e9c6097 to 4910599942c0
d78564aad2 Roll vulkan-deps from 3317f9533df9 to 862e523d9e3d (1 revision)
d238c67b4f Roll vulkan-deps from 4a16c5226357 to 3317f9533df9 (4 revisions)
709deddd90 [graphite] Tweaks to atlas path renderer selection
b6186e1b39 Reland "[vello] Enable the bump allocation estimator"
86dec95392 Roll vello 6c1e8b815b1e...6938a2893d6a (18 revisions)
f69e896761 [graphite] Detect and apply nearest filtering for image shaders
d1118d5685 Add a Test-Mac-PDF job
11d892ce49 [fontations] Test to fail to compare gracefully
112d6143c6 [svg] FEComponentTransfer support
7fda1061a7 [svg] Add SkSVGFeMerge.cpp to public.bzl
84acad6fab [pdf] Pass typeface, not data, to subsetter
44119e4379 Add SkSVGFeMerge.h to public.bzl
73fc05c693 graphite: add fSetBackendLanels in ContextOptions
3812e11086 Reduce timeout threshold for Mac11 tasks
725d9d8141 Revert "GraphiteDawn: use dawn's LoadResolveTexture extension."
4a0ea4fc89 Reland "[graphite] Enable basic texture reuse within a Recording"
822a7d25ad [svg] Add FEMerge support
40fcf198d0 Roll vulkan-deps from e5cd267adee1 to 4a16c5226357 (1 revision)
b1717a5e96 Roll SK Tool from 14a9c90d4ad7 to 54d46e9c6097
351dbb411a Roll Skia Infra from 996de99d5bf7 to 14a9c90d4ad7 (7 revisions)
85a8dcee5e Roll Dawn from 23344086b8f1 to 94ceac3a5f35 (24 revisions)
205d04d050 [graphite] Delete redundant availability check in ScratchResourceManager
cb016dd715 GraphiteDawn: use dawn's LoadResolveTexture extension.
a002d668e0 [graphite] Do not send extremely large shapes to compute path atlas
c29f6694c0 Revert "[graphite] Enable basic texture reuse within a Recording"
9903bf73ef [graphite] Enable basic texture reuse within a Recording
33773472f9 Add module for skottie utils
d1280f1a84 Roll vulkan-deps from a99b3c8f05ae to e5cd267adee1 (6 revisions)
81c68b6e1a [graphite] Query backends for additional sampler desc information
dfa80127d9 Revert "[graphite] Disable analytic blur for rrects"
152ffba705 [graphite] Adjust the distinction between Paint and Flush timing
e468dd0390 Roll FreeType from f42ce255 to a4642422 (30 commits)
c7cd1e9690 Roll HarfBuzz from c053e8f2 to b74a7ecc (40 commits)
1f2298d663 [freetype] Roll script to check for shallow clone
0682e11ea9 Optimize WGSL swizzled assignments.
95d36c4947 Fix signedness of format string.
0898ab086e First pass updating our sample skotties to be compliant with the spec.
bb9e5aa03f [harfbuzz] Roll script handling of duplicates
2813bc2120 Add stub target for pdf's harfbuzz dep
c2a399a74d Clean ALooper logs in viewer android application
2a368794c7 SkJpegMetadataDecoderImpl: Clean up Apple gainmap rendering
aa82350f9c Roll SK Tool from 996de99d5bf7 to 58465be29a8d
13c60c1962 Roll SwiftShader from 76f7f8cfea80 to da334852e705 (5 revisions)
68ab865c01 Roll Dawn from 8f1e9f35e615 to 23344086b8f1 (16 revisions)
1dedd161b0 Roll Skia Infra from 825a4029e916 to 996de99d5bf7 (7 revisions)
f4e251cc84 Roll vulkan-deps from cb509807efbe to a99b3c8f05ae (10 revisions)
91088addfb SkJpegMetadataDecoder: Clean-up and de-duplicate code
4e83fac127 Revert "[graphite] Make MatrixConvolutionImageFilter stably keyed"
088ee8cc3a [graphite] Include Recording creation & submit in Viewer flush times
df446841e3 [graphite] Move CopyAsDraw into TextureUtils
f47ccf389d Roll skottie-base from 6d0d7269a8c9 to 8ecbf179f1e3
88949f64a0 [fontations] Use %zu instead of %ld in test
76f88de905 Run gofmt
3b3b1edf5e replace deprecated ALooper_pollAll calls with pollOnce
375954c628 [Graphite] Add support for setting texture labels on backends.
4019d8957c Reland "Update clang_win and win_toolchain assets"
6292864d68 Fix experimental use of generate_cpp_files_for_headers
d965fc1fd3 [graphite] Add child DrawTasks to DrawContexts when drawn; track pending reads
1b34ce9fd6 [graphite] Make MatrixConvolutionImageFilter stably keyed
7718bac73a [graphite] Don't instantiate budgeted Surfaces immediately
23014baf39 Update rules to enforce IWYU in the modular build
d8427844b8 [graphite] Delete duplicate null check/warning
f1b178295a Roll vulkan-deps from e70a70873c7b to cb509807efbe (1 revision)
c7794fee80 [graphite] handle drawPath with oval/rrect as special case
e50318bf2e Roll SK Tool from 825a4029e916 to 25a2a685e52e
4a1c974147 Roll Skia Infra from be0e106b41c7 to 825a4029e916 (7 revisions)
33eb7e91e9 Roll Dawn from 35243cd3490b to 8f1e9f35e615 (30 revisions)
61d0837821 [graphite] Let Surface automatically generate mipmaps when rendering a picture image
b49a150402 Roll vulkan-deps from 5fe3cf4db2e6 to e70a70873c7b (1 revision)
423b224869 Change CtsEnforcement for SurfaceAsyncReadPixels
22450da817 [graphite] Add immutable sampler attribute to DescriptorData
e4a8128984 Revert "[graphite] Fix use of linearFilterInset in texture shader."
69f928598c [graphite] Add YCbCr GM to graphite
879827699d Revert "Update clang_win and win_toolchain assets"
ebef751401 [graphite] Disable analytic blur for rrects
34ec897022 Update clang_win and win_toolchain assets
71848144fd [Graphite] Fix build for labels.
e0fb636390 Add parentheses to permit constant folding.
ca9c009e27 [graphite] Fix use of linearFilterInset in texture shader.
cf2118c1cd [Graphite] Set labels on proxies for specific usages.
831a5602fa Add missing tag for zlib.h #include
3dfd728e52 [graphite] Avoid unnecessary copy from makeImageSnapshot() in picture-shader rendering
9b0dd65544 Fix PathKit test.
2319f1ae8f SkJpegMetadataDecoderImpl: Move to separate file
bea3840c43 Enforce IWYU on src/pdf
fd78055777 Fix skunicode when building as official build
d82ba10c79 Remove unnecessary helper function from SkParsePath.
f86b71ff70 Roll vulkan-deps from b7189c2c58b3 to 5fe3cf4db2e6 (6 revisions)
6a50e5207d Roll SK Tool from be0e106b41c7 to ba30bcd2a846
37ce37bd68 Roll Skia Infra from 69c4b5eb737c to be0e106b41c7 (8 revisions)
54cd380053 Roll Dawn from 143693480afe to 35243cd3490b (11 revisions)
19c1b735d4 Use a smaller buffer for formatting SVG coordinates
0015580cb2 Roll vulkan-deps from ddde7993328c to b7189c2c58b3 (1 revision)
b0fd7c692d Manual roll Dawn from a87c5333bf91 to 143693480afe (4 revisions)
1a4531b09e SkJpegMetadataDecoderImpl: Add empty files
df92bf1b8b Remove guard for fast affine blitters
869cacf2a3 [graphite] Call notifyInUse() on images not known until AddToKey is called
a5c042cb4b Mark all Test-Fontations jobs as NativeFonts
d7938c006b Remove non-standard verb from SVG parsing
8dff9ab0a9 [graphite] Remove unnecessary check in onNewImageSnapshot()
7182979fce [graphite] Don't rewrap TextureProxy in a new Image in RescaleImage()
1e9a19dcc2 Remove empty directory
78db1456aa Expand test coverage of partial SVG paths
da772ace76 Add dedicated fuzzer for SVG parsing code
a9f5086f75 Manual roll Dawn from b94ef82a4b1e to a87c5333bf91 (48 revisions)
29e77cd140 [fontations] Treat sbix more like FreeType
ffb43af031 Fix MSAN use-of-uninitialized-value error in libjpeg.
01f5db0121 Make skunicode_icu for android depend only on icu headers
4754c3fd6b Manual roll vulkan-deps from 64237dc9f393 to ddde7993328c (5 revisions)
3bc48d128d Revert "Bump the npm_and_yarn group across 8 directories with 11 updates"
2da0f29636 Bump the npm_and_yarn group across 8 directories with 11 updates
7f582d0543 Roll SK Tool from 69c4b5eb737c to c5f8e961f8ab
1454154ed1 Roll Skia Infra from 252d184177c3 to 69c4b5eb737c (5 revisions)
2365dff19e Roll vulkan-deps from 87601d00de4a to 64237dc9f393 (1 revision)
3d798c416f Roll SK Tool from 13f153f3deb7 to 69c4b5eb737c
51dc771647 Roll vulkan-deps from 9d4c2ff6d348 to 87601d00de4a (1 revision)
9dd5305fe1 Revert "SkJpegMetadataDecoderImpl: Move to separate file"
6dca514c5c SkJpegMetadataDecoderImpl: Move to separate file
f502dcb08c Roll SK Tool from 252d184177c3 to 13f153f3deb7
7911dd3d0b Roll vulkan-deps from bb6365e1dcd3 to 9d4c2ff6d348 (6 revisions)
95302626a8 [graphite] Define ScratchResourceManager
f9409f6a7a [fontations] Correct CBDT glyph bounds
ad143675a4 Fontations to vary font style with variation
82c0277aca Don't turn italic into oblique in FreeType
1b72286d03 [graphite] Pare down pipeline labels' texture info details
cf770b2026 Ensure that fImage[] always has at least one element.
6ca5507db3 Expand TypefaceStyleVariable test
00e5d245f7 Update drawVertices named fiddles to use kDst blend mode.
7b1e131050 Remove APP15-based gainmap support
92d762cfe0 Roll ICU used for testing (and shipped with CanvasKit)
37b9f707ce Roll vulkan-deps from 1526c466aadc to bb6365e1dcd3 (5 revisions)
8f58086501 Roll Skia Infra from 1092e40f5ba5 to 252d184177c3 (5 revisions)
d2f0fd0faf Roll SK Tool from 1092e40f5ba5 to 252d184177c3
2eaea03832 Roll vulkan-deps from 23709f0474fe to 1526c466aadc (5 revisions)
df970dcd6c [viewer] Add `disable_tint_symbol_renaming` option
716e757c1f [graphite] Add option to DrawAtlas to allow use of storage textures
c6ff3a1b1e Make ATrace backend record arguments as sub-events in Android framework
e0aa078eb4 [fontations] Use CBDT advances
a6dd576d7d [Graphite] Fix Emscripten build after label change.
5e18775601 [graphite] Change GraphiteDawnTestContext to use new devicelost setup
f9671ecda7 [fontations] Properly place CBLC/CBDT glyphs
92060e2245 Disable GM_matrixconvolution_bigger/_biggest on the Nexus7/Tegra3
8690d4a8e2 [Graphite] Add initial label support on Textures.
8949190030 [Graphite] Add support for setting label on backend Buffers.
d96628dc09 [graphite] Wire up VelloScene::append
a0f0c08f31 [graphite] Add convenience method to get SharedContext from RecorderPriv
55d8d958b5 graphite: Explicitly destroy Dawn buffers
d24d31650b Remove Perf-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Graphite_Dawn_Metal job
4dbf9ad5fa [graphite] Add flag to mark Plots as 'full'.
a05fc40ab3 [graphite] Restructure ComputePathAtlas::recordDispatches to take list
04f1e4b579 Ignore mipmapping requessts for externally wrapped WebGL textures
d37c4d0c5e Roll vulkan-deps from 276647759516 to 23709f0474fe (4 revisions)
6c41182ab9 Roll Skia Infra from 85cd35a9f8f3 to 1092e40f5ba5 (8 revisions)
983096caa5 Roll Dawn from 816f6abb4c9a to b94ef82a4b1e (20 revisions)
7c68b9c33b Roll SK Tool from 8cb1d9ce0d7a to 1092e40f5ba5
97aa3f4cf2 Flatten branches from complex path of analytic_rrect_coverage_fn.
81ccf3ab27 Roll vulkan-deps from ae1ce5ca5a1e to 276647759516 (1 revision)
36ec16922d Move #include "zlib.h" outside of anonymous namespace.
f75478d494 [infra] Update GPU driver version for Windows IntelIrisXe machines
553b6e2edd Roll skottie-base from 4a3a57f4bb79 to 6d0d7269a8c9
e04195906d Fix uses of arithmetic conversion on enums.
e48ecb7842 Add SkPath::addOpenOval
876131b03d [graphite] Reduce the SkMatrixConvolutionImageFilter's program combinations
7e4295509c [infra] Roll infra, remove python2 hacks
0b31f64bd8 [infra] Use vpython3 package instead of old vpython
df7e61ca86 Reject path triangulation after 500,000 self-intersections.
341ee60bc0 Roll vulkan-deps from 9384550810a5 to ae1ce5ca5a1e (2 revisions)
bfbd738fb9 Roll SK Tool from 56ddf34cf380 to 8cb1d9ce0d7a
be81fc2dc4 Roll Skia Infra from c3eaa8e0f793 to 56ddf34cf380 (5 revisions)
5f4ebd6289 Roll Dawn from 690f568c5a84 to 816f6abb4c9a (11 revisions)
a6bc04f984 Escape unicode sequence
30aaaef039 Roll skottie-base from f83e07df2219 to 4a3a57f4bb79
48f95d13d6 Roll vulkan-deps from 09d0317bc33e to 9384550810a5 (10 revisions)
1428a863a9 Tweak harfbuzz dep for legacy Bazel build
77494fd568 Run prettier on all sample skotties
85ec65ecd5 Simplify binary search in tessellate_stroked_curve.
04ee4daaea Use dot product when computing distance field gradients.
77350e051f Fix offscreen size in Viewer for some GMs.
8f2d039e11 [bazel] Make it possible to replace @skshaper with select
459555f490 Revert "[graphite] Revert KeyContext copy ctor behavior to earlier state"
b20651c1aa Roll SK Tool from c3eaa8e0f793 to 0589073495d2
0f28298a88 Roll vulkan-deps from 5eaadb2feb71 to 09d0317bc33e (8 revisions)
bde9eccf9f Roll Skia Infra from 94a452f2f2ae to c3eaa8e0f793 (6 revisions)
0b22a72dff Roll Dawn from 9e232c0d6fc8 to 690f568c5a84 (217 revisions)
e9d3faf63f Remove duplicated .cpp files in Bazel rules
29a483abf3 Factor out fold_two_constants into a helper function.
b1c4656b5b Remove unnecessary virtual from method.
9ffb18cccf [graphite] Analytic blur for rrects
f83627264e Roll depot_tools and recipes-py
e808ffae8c Simplify/optimize SkPath::hasOnlyMoveTos
60491fb0ff Roll vulkan-deps from a2456e74640e to 5eaadb2feb71 (2 revisions)
953589c71b Add SkArc (in)equality operators
2d47a0fe07 Add a FixedArray class to shrink SkSL::ComponentArray.
b5745c5ba3 Clean up TArray tests and add a comparison test.
8a63d228d2 Roll skottie-base from b0e42fbd5e63 to f83e07df2219
ae841c097f Remove reference to deleted file
8ced43c89f Remove unused version of Swizzle::Convert.
f7bfa8eef5 Report an error if `sk_Caps` is used as an SkSL expression.
27e8723499 [graphite] Revert KeyContext copy ctor behavior to earlier state
aeab790380 Roll SK Tool from 94a452f2f2ae to bca2b386b5e5
c720e24469 Roll Skia Infra from 07bdf2c05272 to 94a452f2f2ae (20 revisions)
1a5436d509 Roll vulkan-deps from 5c853cf916a0 to a2456e74640e (1 revision)
e3dfcd1b25 Roll SK Tool from a42fa34aea30 to 94a452f2f2ae
2de6be2536 Roll vulkan-deps from 9dbe6ddebdf8 to 5c853cf916a0 (1 revision)
362737e0d9 Roll SK Tool from 07bdf2c05272 to 57b1569a232f
7e92a0458e Roll vulkan-deps from 736920240f0b to 9dbe6ddebdf8 (7 revisions)
57158c5454 Add missing visibility to Bazel rule
a819e9fa30 Allow pre/post-increment on vectors and matrices.
5f61cbbbf3 Add support for non-scalar pre/postincrement in SPIR-V.
04bcfe9aed Make module for mock ganesh backend
a86518ac9d [graphite] Compute largest valid UV inset rectangle for subsets.
49f65626b8 Add support for matrix pre/postincrement in Metal.
44976535e2 Properly pre-size path storage in addOval and addRRect
2c908008c0 Add SPIR-V `writeBinaryOperationComponentwiseIfMatrix`.
3a64e02635 Fix signedness of format string.
b670fe0cb0 [graphite] Remove unnecessary checks in UV inset setup.
89e703d0a2 [graphite] Dst copy tasks stored in DrawTask not root Recorder task list
9d8370e279 Revert "Use a VMA block size of only 64k"
605990e9e3 Improve SkArc ergonomics, use it everywhere but SkCanvas
222a354c3b [graphite] Assume sources are already instantiated in copies
36e3b53758 Roll vulkan-deps from e65031c8b1d6 to 736920240f0b (1 revision)
4aa03c55a0 Roll Skia Infra from e6a1f0f0732a to 07bdf2c05272 (10 revisions)
ae813c0ef8 Roll SK Tool from e6a1f0f0732a to 07bdf2c05272
518a85e019 Roll vulkan-deps from c771d4aa9a32 to e65031c8b1d6 (2 revisions)
3401ef9641 Move some Ganesh rrect blur code to gpu/
41347f92ce [graphite] Remove 'k' from op labels
dc5f113e51 Fix protected setting in unit test
49747c45f7 [svg] Add new private header to public.bzl
7cfe6424ba Apply fixes to coretext Bazel targets
52083c2050 [graphite] Instantiate non-budgeted TextureProxies in Make()
cb32ad6196 [graphite] Fix edges of YUV images.
12b8f084df [svg] Optional ellipse radii
67bba57bfe [graphite] Swap the PrecompileShaders and Priv LocalMatrix factories
b440433e2d [graphite] Add RenderPassDesc to pipeline labels and traces
b0e3650854 Preserve presence/absence of optional matrices in CanvasKit
8ea6c1d872 Increase RescaleWithTransform tolerance slightly more for Pixel 4a
283d3e4e8e Roll vulkan-deps from daa9d07a18bb to c771d4aa9a32 (3 revisions)
15da9c78dd Roll SK Tool from 72b1e50d159a to e6a1f0f0732a
e1fbdd02b7 Roll Skia Infra from b24132ef5cdf to e6a1f0f0732a (21 revisions)
864f6d868e Roll vulkan-deps from 8ff7d8bf1899 to daa9d07a18bb (1 revision)
afcc1db275 [Graphite] Add labels for buffer resources.
a315d1b8e3 [graphite] Reduce shader variation due to LocalMatrixShaders
510b6766d9 [graphite] Move YUVATextureProxies logic into Image_YUVA
39f905ad30 [graphite][cleanup] Remove unused kIgnoreMaskFilter flag
a209f753ac Remove Pixel3 and Intel BayTrail devices.
6e2468d5ff Reland "Reland "Restore affine bitmap procs""
79b5ac4505 Add define to signal Android FontMgr is available
4b6711d7bd [graphite] Precalculation for analytic circle blur
bf79a8c20f Roll shaders-base from cbf986e97789 to edc6a51fe9de
b4d550015b Roll debugger-app-base from 24edbde4082b to e9508b902e1a
546a02d64d Roll skottie-base from 822c202b73bc to b0e42fbd5e63
a88f79b972 Roll jsfiddle-base from 453d00b44c6b to c9b24124977b
c2d58dd1cb Roll vulkan-deps from f231db78374b to 8ff7d8bf1899 (3 revisions)
9e23cc5700 Roll SK Tool from b24132ef5cdf to 26741f478094
d7c069ec70 Roll Skia Infra from eb81b28b0318 to b24132ef5cdf (11 revisions)
a5722fa659 Roll SwiftShader from 9aec4b969291 to 76f7f8cfea80 (1 revision)
749c16f4f0 [graphite] compute-msaa8 atlas path rendering mode
63b413f5fd [graphite][dawn] Ensure r8unorm storage usage is not advertised in WASM
b5dd23bd29 [graphite] Support one-time-only tasks in Recordings
e15464e6e9 Add isArc to SkPath
7a01addbf4 Roll skottie-base from 99fa81c4c166 to 822c202b73bc
cdede8e2e1 Do not create the image filter cache just to purge it
f09c674503 Roll vulkan-deps from 91b20c9cf5fd to f231db78374b (5 revisions)
f9d6a2cf41 Add serially-executing CPU test category to DM
21563606e3 Remove crashing Linux Graphite Dawn Vulkan perf task.
0a46173421 Transition magic numbers in VulkanSamplerYcbcrConversion to static values and add convenience method
0756b4606e Roll skottie-base from afa5f1b307bd to 99fa81c4c166
786b4cbe99 [graphite] Handle failed buffer mappings in DrawWriter
7615d1ebbf Revert "Reland "Restore affine bitmap procs""
a373bf46bf Roll SK Tool from eb81b28b0318 to 6f21ddc207d7
f1a6e334f6 Roll vulkan-deps from b7e3beee69a5 to 91b20c9cf5fd (11 revisions)
fc92fe1061 Roll Skia Infra from b7cc986dba6d to eb81b28b0318 (4 revisions)
fe545a316f Fix signedness of format string.
db21ce8d0f graphite: add slice in DawnTextureInfo and DawnTextureSpec
e6de04b82b Remove assert in Slug deserialization
d9ebf2e8f3 Reland "Restore affine bitmap procs"
3c5823247a [graphite] Remove stale TODO comment re r8unorm storage
36a003f0f3 [graphite] Use analytic rrect renderer in all path strategies
91c040a316 Sort load order
0401db22ad [graphite] Analytic blur for circles
3b32e3280b Add default_applicable_licenses to all BUILD.bazel files
eb29b46236 Roll vulkan-deps from 71b11532ed72 to b7e3beee69a5 (1 revision)
d1397feba0 [graphite] Fix canvaskit build
1ec0b5eef1 [graphite] Relax fLastTask assert in Device::flushPendingWorkToRecorder
911baf3ab4 [graphite] Rename RectBlurData to AnalyticBlurMask
79f7151cd3 Remove calls to SkScalarToFloat and SkFloatToScalar.
3d162b0ae9 Remove SkScalarIsFinite/NaN from public API.
5510e748bb [graphite] Don't store unmappable buffer as reusable
22d1130a2b Roll SK Tool from b7cc986dba6d to 2bc8bf46657d
2a149de1cb Roll Skia Infra from dcb627bc133f to b7cc986dba6d (7 revisions)
975859a96f Roll SK Tool from e8d0ea559f94 to b7cc986dba6d
dec629b762 Roll SK Tool from dcb627bc133f to fd7f30873028
9735c573e7 [graphite] Track failed Buffer mappings to cause snap() to return null Recording
49e112b169 [graphite][vello] Use R8UnormStorage feature in compute path atlas
7be6fe3150 Roll vello from 74715ee4650e to 6c1e8b815b1e (19 revisions)
514d7fc627 Roll vulkan-deps from 4737535cad1a to 71b11532ed72 (6 revisions)
4597ff66fb [paragraph] Only load typefaces once in tests
1192bb867a Revert "Restore affine bitmap procs"
61e6030c5c Make sysopen python3
578e79bdde Replace SkIsFinite with a parameter-pack implementation.
392f7561ac [graphite] One-time uploads can be discarded
1910252ea2 [graphite] Add Swizzle::selectChannelInR(i) helper
6af0f1febe Tweak RescaleWithTransform test expectations
1e004cfb9f Add SkArc
f4a214ecf1 Switch std::isfinite to SkIsFinite throughout Skia.
0689969ffa Reland "[graphite] Remember last snapped task for scratch devices"
fa31a916cb Restore affine bitmap procs
d01e53b8be Roll depot_tools and recipes-py
84addd92a3 Always pin the sweepAngle in CreateDrawArcPath
0bdd0daaa3 Roll vulkan-deps from 707349d2ea9e to 4737535cad1a (6 revisions)
7ad507eca0 Roll SwiftShader from 764410d4d655 to 9aec4b969291 (2 revisions)
199990cc39 Roll Skia Infra from e3ade2b88835 to dcb627bc133f (17 revisions)
ca5481ebd0 Roll SK Tool from e3ade2b88835 to dcb627bc133f
fef9f27093 [graphite] Refactor VULKAN_CALL_RESULT to call checkVkResult
4f6bdf86e8 [pdf] Emit FontFamily/Stretch/Weight for Type3
dd177d3c8e Roll vulkan-deps from aa20d192b8c4 to 707349d2ea9e (3 revisions)
f92376f172 Run gn_to_bp.py with python3
a9b6705071 [graphite] Add TextureProxyView::replaceSwizzle()
0e3bd4c3f1 Revert "[graphite] Remember last snapped task for scratch devices"
8f94bcb11d Implement ASAN poisoning for TArray reserved capacity.
8fd4d8eaad Move SkFloatBits.h into src/base instead of include/private.
edece87ce7 Fix crash in nanobench IsFinite benchmark.
22eecb3e3d [graphite] Add Image_YUVA::Wrap factory to handle validation
8b5ed90794 Add EGL factory
08a3936600 Update format strings in docs/examples for correct signedness.
ffecf738d7 Round up SkSTArray storage to an 8 byte multiple.
1af1e478ef [graphite] Remove merge error comment from QueueManager
fb084e805c Fix backquotes in iOS docs.
e476fd844e Remove sk_float|double macros which mirror <cmath> functions.
294267d812 Remove dependency on SkFloatBits.h from SkFloatingPoint.h.
724cca0568 Remove code from docs/examples which uses SkBits2Float.
78988c7c01 Update iOS docs to include new GN signing variable.
d46c8068a1 Add snapshot and detach to SkPath
bd6746e5de [graphite] Remember last snapped task for scratch devices
1a1eddc161 Move to vpython 3.11
211eda11eb Minor Bazel rule fixes
dc6df91376 Fix Clang warning in release about unused variables.
36bdf9df77 Remove add_codereview_message.py
1f74f67959 Add public interface to create iOS GrGLInterface
e3982dc9a1 Add public interface to create Mac GrGLInterface
500fd99f0a Remove shim GrBackendDrawableInfo.h
d7f79d7183 Remove unreferenced function in SkFloatingPoint.
4fb772942c Roll vulkan-deps from 6066c0d57a8b to aa20d192b8c4 (3 revisions)
54c2053bab Roll SK Tool from faf506208c4f to e3ade2b88835
384934acb6 Roll SwiftShader from 1eaac56def92 to 764410d4d655 (2 revisions)
32a36614f8 Roll Skia Infra from 758eb2157020 to e3ade2b88835 (2 revisions)
d221c1591d Update SkBits2Float and SkFloat2Bits to use uint32_t.
a77eb69afc Revert "Roll depot_tools, recipes-py, python 3.11"
a3a016537a Roll depot_tools, recipes-py, python 3.11
e29d8070a6 Remove SkRemotableFontMgr
659bf773ee Roll skottie-base from cfb2d3940fbd to afa5f1b307bd
5958cd52db Update format strings to take signedness into account.
84afce37fe Roll vulkan-deps from 6bcdc072b044 to 6066c0d57a8b (4 revisions)
a78dec0c05 Manual roll Skia Infra from 61056bfd26b3 to 758eb2157020 (9 revisions)
d00446c13c Add chaining capability to SkPath offset and transform
3b66e71327 Move some Ganesh circle blur code to gpu/
cb16ab2851 Initialize more fields in VulkanBackendContext.
0c56bd4729 [graphite] Combine YUVA and regular promise image callbacks
98a190719c Remove all Mac 10.13 and 10.14 jobs.
2eb1def98b Roll skottie-base from 9727f56830b9 to cfb2d3940fbd
17753f2d2d Discard data written to a null BufferWriter
2790777048 Update documented minimum supported OSes
f0b70c3ed9 [recreate-skps] Sync depot_tools to most recent commit
134acb7371 Remove unused constant from SkPathRef
4b3b84c0be Roll vulkan-deps from 8dc5cb57074c to 6bcdc072b044 (3 revisions)
1832de3381 Roll SK Tool from 61056bfd26b3 to 73681e842bf0
2b32391252 Roll Skia Infra from 80097301710b to 61056bfd26b3 (4 revisions)
f404603cc9 Roll Dawn from 4cb74f447cb7 to 9e232c0d6fc8 (20 revisions)
d9688b02de Remove SkFontMgr_New_DirectWriteRenderer impl
e6e9044ee1 Rearrange fields to shrink SkPathRef
e335a0a11a Remove guards for old versions of mac
b83b6bf717 Address null colorSpace in PDF Device
cd38038210 [graphite] Restructure tracked device cleanup in case its called multiple times
d506a3d526 update to libwebp 1.4.0
27e94ab0ce Move SkASAN.h to include/private/base.
98dbba281a [graphite] Add ImageFilter precompilation to PaintParamsKeyTest
0a88c0e67f In the Fuchsia font manager, add the style parameter that is now required by SkFontScanner_FreeType::computeAxisValues
78cdc5f846 Allow old CoreText to return wrong style
70062f2aba Roll vulkan-deps from ea0fb515f594 to 8dc5cb57074c (2 revisions)
152f944ca0 [graphite] Impl. public image API in Image_Base via copies
8fc8324a1b [graphite] Add PaintParamsKey to pipeline labels and traces
55b64cbaad Add SkColorSpace to SaveLayerRec
d8f1f0622d Test variable font style
7be8fa2f36 DirectWrite to vary font style with variation
2fe1f040aa FreeType to vary font style with variation
c34d50e02e [graphite] Add minimal API to specify precompilation ImageFilters
300741074b Update libpng to 1.6.43.
75083dc8a3 Remove Test-Win10-Clang-RUBYR5-GPU-RadeonVega6-x86_64-Debug-All-Direct3D also.
429ec245f4 Roll SK Tool from 80097301710b to e7f4512b2810
8013b7f1dc Roll Dawn from f20a53466bc2 to 4cb74f447cb7 (21 revisions)
ba092b9617 Roll vulkan-deps from ec0c320a8ca1 to ea0fb515f594 (8 revisions)
f8b182d9a0 Roll Skia Infra from f184d1bfa242 to 80097301710b (6 revisions)
d76c0f7af9 Merge 8 release notes into RELEASE_NOTES.md
f8fcd75a81 Update Skia milestone to 126
50ac1117f1 Roll SwiftShader from 62c59c41e194 to 1eaac56def92 (1 revision)
b159229f21 Remove old, private SkMultiPictureDocument
f6a2a2af83 Roll skcms from 934b734ed72a to 9478a634ff6d (1 revision)
f4e76d22c5 [skottie] Text preshape experiment
0b5df02017 Reland "Add GN variable to disable iOS signing"
d27e288efd Be more consistent in nanobench across Ganesh and Graphite.
684299b118 Update libwebp version to match chromium's
966f7eb645 Revert "Roll ANGLE from 66bc9cfa0014 to 9bae58594634 (4 revisions)"
88196037bb Fail SkParagraph GMs gracefully when unicode fails to be created
8093b0a0ae Remove Test-Win10-Clang-RUBYR5-GPU-RadeonVega6-x86_64-Release-All-Direct3D from the tree for now.
9b69f1598f [graphite] Analytic blur for rects
0fe107da5a Roll vulkan-deps from 04aa78e8dbcb to ec0c320a8ca1 (2 revisions)
81ddcd2ef4 Simplify special path type tracking
c5df95a2bd Revert "Add GN variable to disable iOS signing"
22b790d7eb fix guard for skunicode
6294957f01 [graphite] Calve off PrecompileCombinations into its own helper
2461737682 Expose the getClientICUData() to ParagraphBuilder
0d14332811 Add job to test with checked-in FreeType
70ff97b2d5 Fix up mac-related modules
5d32c1dcae Roll SK Tool from f184d1bfa242 to 80e2cdd73b81
bbe2ea7bbd Roll Skia Infra from bae2b98850ac to f184d1bfa242 (7 revisions)
79d32421b5 Roll Dawn from 0e14373fbbeb to f20a53466bc2 (10 revisions)
fbc5b8bb53 Roll vulkan-deps from 5171f7f9892a to 04aa78e8dbcb (1 revision)
625637fb61 Roll vulkan-deps from 46248e60c4fa to 5171f7f9892a (1 revision)
62457b6cb0 Revert "Temporarily remove iOS bots from CQ."
d77d420411 Roll vulkan-deps from 7922b393e32b to 46248e60c4fa (2 revisions)
293de35a9d [graphite] Add Image::Copy to handle both blit and draw copies
3cd1a3fce7 Manual roll ANGLE from e41286e1092c to 5e790bfb16e8 (6 revisions)
ab7415781c [graphite] Move DrawAtlasMgr to PathAtlas.
842440b982 [graphite] Add CopyAsDraw helper to Image_Base
e8affe3b49 [graphite] Add Device::isScratchDevice() helper
91f017118f [graphite] Add validation asserts to Device/Recorder flushing
7e95e626bb Reland "[graphite] Start with kDiscard load op in DrawContext; use clear op for floating-point textures"
c6c8dfba70 [graphite] Remove unique ID from Image[_YUVA] ctor, rename MakeView
d11ebee8c4 Add GN variable to disable iOS signing
4f353cdc1e Manual roll Dawn from a79a81394ea6 to 0e14373fbbeb (26 revisions)
2fcf3fa483 Roll vulkan-deps from f8fa42b1fbea to 7922b393e32b (10 revisions)
8fd30ab172 Roll SK Tool from cf3b51b7e14e to c150177839d1
b40fdf1234 SkICC: Improve tonemapping precision
03993ad9ce [skottie wasm] Fix inline font decoding
096917613b Reland x2 "Graphite/Dawn: Eliminate Device::Tick() usages."
5485c5d582 Remove SKCMS_REPLACE_IN_GOOGLE3_COMPATIBLE_WITH
67bbcc3b30 Another NaN guard in SkConic support code
5b837c0969 Guard against wild conics while stroking
9e20a146c0 Update iOS Certs for 2024.
5739caf1ed Fix premature loading of slide image.
ba1e04625d [Graphite] Add BlurShader to Precompile system
aacf97b588 Update OpenGL ES Interface autogeneration for GL_ARB_invalidate_subdata
78f0b8a7ed Reland "Migrate SkParagraph's tests etc to provide SkUnicode"
4da3e23c1e [graphite] Allow PrecompileImageShader to skip cubic filtering combinations
79c043bfa0 Roll HarfBuzz from 4cfc6d8e to c053e8f2 (342 commits)
761f6f7f62 Temporarily remove iOS bots from CQ.
5101cbe5a6 Enforce IWYU on headers in src/gpu/ganesh/mock
08940c2e0c [Graphite] Reduce calls to processReturnedResources in ResourceCache.
112fff965f Remove obsolete DSL class IDs.
e7ab38dabb Define move constructor in AutoLayerForImageFilter
1dc3c2c1b5 [graphite] Expand DrawTypeFlags to allow finer control of options
2a2fe43035 Roll vulkan-deps from 44110e2c91b9 to f8fa42b1fbea (8 revisions)
aa30d76a34 Roll ANGLE from 392eca60484e to e41286e1092c (4 revisions)
29f0c9d84e Roll SK Tool from bae2b98850ac to df7f5a8a3885
3a17900011 Roll Skia Infra from be41dc6ed635 to bae2b98850ac (12 revisions)
363a8ed800 Roll Dawn from 0a552b460b26 to a79a81394ea6 (21 revisions)
28579a88aa Revert "[graphite] Start with kDiscard load op in DrawContext; use clear op for floating-point textures"
cd47aa5d8d Roll vulkan-deps from 35d6b77d10f5 to 44110e2c91b9 (4 revisions)
fcb5c05aca Manual roll ANGLE from d55464fff7b0 to 392eca60484e (18 revisions)
5bbca5a306 [graphite] Split out ComputePathAtlas into its own file.
1a1b0517a3 [graphite] Start with kDiscard load op in DrawContext; use clear op for floating-point textures
806290391d [graphite] Track aggregate protected status on YUVA images
91e0c0f4bf Update gn to allow looking for shortened clang version.
53db15f41e Improve Windows build docs based on user feedback.
86e41960bc Properly convert between axis definition types
df6d08abb4 [graphite] Simplify copies and special-images around Image
2135d68670 Roll vulkan-deps from fc7b9c1b84df to 35d6b77d10f5 (3 revisions)
89db27b5ac Roll SK Tool from be41dc6ed635 to 25904469c21f
3544e01a8e Roll Dawn from aae22bdd5489 to 0a552b460b26 (17 revisions)
1ea5f3cd71 Roll Skia Infra from e6b3a4e3da47 to be41dc6ed635 (11 revisions)
14dd5528b3 Remove SkDrawLooper entirely
033526362f [wgpu-headers] Manually lose the device before losing the Instance.
3e3f28d64b Graphite: use Unorm16TextureFormats for grapghite test context
45eeeddb00 [pdf] Allow OpenType CFF fonts to be embedded
74b0e26886 Roll vulkan-deps from 57a0fe0778df to fc7b9c1b84df (4 revisions)
80b8df2ddb Manual roll Dawn from f51ecbb7b732 to aae22bdd5489 (17 revisions)
a86861d21a Revert "Migrate SkParagraph's tests etc to provide SkUnicode"
977c94ecfe [graphite] Fix linear filter inset variable names.
7df2ea3e06 [graphite] Explicitly hold SkBlendModes in PaintOptions
e30486e1fb Add VkComponentMapping to VulkanYcbcrConversionInfo
9229e42e81 Add one more case for SkColorType switch
3452b32e7f [graphite] Add linear filter inset for YUV.
6fc1db4e6b [graphite] Fix up PaintOptions::toKey
6184d91ed4 Migrate SkParagraph's tests etc to provide SkUnicode
d954ec3bfc Revert "Reland "Graphite/Dawn: Eliminate Device::Tick() usages.""
bf0bf8b9fe Add ganesh_metal target
6738a9e10d [colrv1] Keep glyphs on test canvas
f1d8fbc731 Minor clang-tidy suggestions
208b83beb5 Roll vulkan-deps from 8072102bca4a to 57a0fe0778df (1 revision)
15687cd279 Roll SK Tool from e6b3a4e3da47 to b09312b32b9c
7d836c087e Roll Skia Infra from fd9ef76964cc to e6b3a4e3da47 (10 revisions)
31efd87f3b [graphite] Consolidate Device/Surface factory functions
8567db100d Fix minor bugs in the SkSL PrettyPrint algorithm.
a0bbf72581 Adds support for BGRA10_XR.

Canonical link: https://commits.webkit.org/278855@main
  • Loading branch information
aperezdc committed May 16, 2024
1 parent f873c16 commit ed896fe
Show file tree
Hide file tree
Showing 1,506 changed files with 257,688 additions and 81,142 deletions.
1 change: 0 additions & 1 deletion Source/ThirdParty/skia/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ build --flag_alias=disable_build_for_debugger=no//bazel/common_config_settings:b
# Flags used by Skia tools, not to be used by clients
build --flag_alias=disable_gpu_test_utils=no//src/gpu:enable_gpu_test_utils
build --flag_alias=enable_gpu_test_utils=//src/gpu:enable_gpu_test_utils
build --flag_alias=compile_generated_cpp_files_for_headers=//bazel/common_config_settings:compile_generated_cpp_files_for_headers
build --flag_alias=adb_platform=//tools/testrunners/common/android/adb_test_runner:adb_platform

# Public CanvasKit flags
Expand Down
2 changes: 1 addition & 1 deletion Source/ThirdParty/skia/.vpython3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python_version: "3.8"
python_version: "3.11"
80 changes: 60 additions & 20 deletions Source/ThirdParty/skia/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
load("@rules_license//rules:license.bzl", "license")
load("@skia_user_config//:copts.bzl", "DEFAULT_OBJC_COPTS")
load("//:defines.bzl", "DEFAULT_DEFINES", "DEFAULT_LOCAL_DEFINES")
load("//bazel:gen_compile_flags_txt_linux_amd64.bzl", "gen_compile_flags_txt_linux_amd64")
load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_cc_library", "skia_objc_library")
load("//bazel:skia_rules.bzl", "skia_cc_library", "skia_objc_library")

package(
default_applicable_licenses = ["//:license"],
)

# https://opensource.google/documentation/reference/thirdparty/new_license_rules
# https://github.com/bazelbuild/rules_license/blob/bcffeb0c481d178cbee69bdc7e23ef22d3a087b1/rules/license.bzl
license(
name = "license",
license_kinds = ["@rules_license//licenses/generic:notice"],
license_text = "LICENSE",
)

licenses(["notice"])

exports_files_legacy()
# Note, we do not need exports_files_legacy() because this file is not synced into G3.
exports_files(["LICENSE"])

# All the mm files from the Skia library are rolled up to this objc library since cc_library
# ignores mm files. This private library is then deps'ed into the public and internal versions
Expand All @@ -29,7 +43,6 @@ skia_cc_library(
name = "skia_public",
srcs = [
"//include:private_hdrs",
"//include:srcs",
"//src:private_hdrs",
"//src:srcs",
],
Expand All @@ -51,7 +64,6 @@ skia_cc_library(
skia_cc_library(
name = "skia_internal",
srcs = [
"//include:srcs",
"//src:srcs",
],
hdrs = [
Expand Down Expand Up @@ -101,21 +113,45 @@ alias(
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_egl_factory",
actual = "//src/gpu/ganesh/gl/egl:egl_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_gl_epoxy_factory",
actual = "//src/gpu/ganesh/gl/epoxy:epoxy_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_glx_factory",
actual = "//src/gpu/ganesh/gl/glx:glx_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_gl_ios_factory",
actual = "//src/gpu/ganesh/gl/ios:ios_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_gl_mac_factory",
actual = "//src/gpu/ganesh/gl/mac:mac_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_webgl_factory",
actual = "//src/gpu/ganesh/gl/webgl:webgl_factory",
visibility = ["//visibility:public"],
)

alias(
name = "ganesh_epoxy_factory",
actual = "//src/gpu/ganesh/gl/epoxy:epoxy_factory",
name = "ganesh_metal",
actual = "//src/gpu/ganesh/mtl:ganesh_metal",
visibility = ["//visibility:public"],
)

Expand Down Expand Up @@ -201,19 +237,24 @@ alias(
visibility = ["//visibility:public"],
)

# TODO(kjlubick)
# alias(
# name = "fontmgr_coretext",
# actual = "//src/ports:fontmgr_coretext",
# visibility = ["//visibility:public"],
# )
alias(
name = "fontmgr_coretext",
actual = "//src/ports:fontmgr_coretext",
visibility = ["//visibility:public"],
)

alias(
name = "fontmgr_data_freetype",
actual = "//src/ports:fontmgr_data_freetype",
visibility = ["//visibility:public"],
)

alias(
name = "fontmgr_directory_freetype",
actual = "//src/ports:fontmgr_directory_freetype",
visibility = ["//visibility:public"],
)

alias(
name = "fontmgr_fontconfig_freetype",
actual = "//src/ports:fontmgr_fontconfig_freetype",
Expand All @@ -229,8 +270,8 @@ alias(
###

alias(
name = "skparagraph_harfbuzz_icu",
actual = "//modules/skparagraph:skparagraph_harfbuzz_icu",
name = "skparagraph_harfbuzz_unicode",
actual = "//modules/skparagraph:skparagraph_harfbuzz_unicode",
visibility = ["//visibility:public"],
)

Expand All @@ -242,12 +283,11 @@ alias(
visibility = ["//visibility:public"],
)

# TODO(kjlubick)
# alias(
# name = "skshaper_coretext",
# actual = "//modules/skshaper:skshaper_coretext",
# visibility = ["//visibility:public"],
# )
alias(
name = "skshaper_coretext",
actual = "//modules/skshaper:skshaper_coretext",
visibility = ["//visibility:public"],
)

alias(
name = "skshaper_harfbuzz",
Expand Down
13 changes: 10 additions & 3 deletions Source/ThirdParty/skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -466,9 +466,6 @@ optional("fontmgr_win") {
]
public = [ "include/ports/SkTypeface_win.h" ]
sources = [
"include/ports/SkFontMgr_indirect.h",
"include/ports/SkRemotableFontMgr.h",
"src/fonts/SkFontMgr_indirect.cpp",
"src/ports/SkFontMgr_win_dw.cpp",
"src/ports/SkScalerContext_win_dw.cpp",
"src/ports/SkScalerContext_win_dw.h",
Expand Down Expand Up @@ -1114,6 +1111,7 @@ optional("jpeg_decode") {
sources = [
"src/codec/SkJpegCodec.cpp",
"src/codec/SkJpegDecoderMgr.cpp",
"src/codec/SkJpegMetadataDecoderImpl.cpp",
"src/codec/SkJpegSourceMgr.cpp",
"src/codec/SkJpegUtility.cpp",
]
Expand Down Expand Up @@ -2368,6 +2366,9 @@ if (skia_enable_tools) {
test_app("skottie_tool_gpu") {
deps = [ "modules/skottie:tool_gpu" ]
}
test_app("skottie_preshape_tool") {
deps = [ "modules/skottie:preshape_tool" ]
}
}
if (skia_enable_svg && skia_use_expat && defined(is_skia_standalone)) {
test_app("svg_tool") {
Expand Down Expand Up @@ -2624,6 +2625,7 @@ if (skia_enable_tools) {
"fuzz/oss_fuzz/FuzzImageFilterDeserialize.cpp",
"fuzz/oss_fuzz/FuzzIncrementalImage.cpp",
"fuzz/oss_fuzz/FuzzJSON.cpp",
"fuzz/oss_fuzz/FuzzParsePath.cpp",
"fuzz/oss_fuzz/FuzzPathDeserialize.cpp",
"fuzz/oss_fuzz/FuzzRegionDeserialize.cpp",
"fuzz/oss_fuzz/FuzzRegionSetPath.cpp",
Expand Down Expand Up @@ -3413,6 +3415,11 @@ if (skia_enable_tools) {
sources = [ "fuzz/oss_fuzz/FuzzColorspace.cpp" ]
deps = []
}

libfuzzer_app("parse_path") {
sources = [ "fuzz/oss_fuzz/FuzzParsePath.cpp" ]
deps = []
}
}
}

Expand Down
1 change: 1 addition & 0 deletions Source/ThirdParty/skia/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ add_library(Skia STATIC
src/codec/SkImageGenerator_FromEncoded.cpp
src/codec/SkJpegCodec.cpp
src/codec/SkJpegDecoderMgr.cpp
src/codec/SkJpegMetadataDecoderImpl.cpp
src/codec/SkJpegSegmentScan.cpp
src/codec/SkJpegSourceMgr.cpp
src/codec/SkJpegUtility.cpp
Expand Down
32 changes: 16 additions & 16 deletions Source/ThirdParty/skia/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling different
# dependencies without interference from each other.
'sk_tool_revision': 'git_revision:d3d1950ebd72b2a3121e40414b381fd85e4e4305',
'sk_tool_revision': 'git_revision:68c060aa348704b86432718db5ca5fc94f52f1c8',

# ninja CIPD package version.
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
Expand All @@ -23,50 +23,50 @@ vars = {
# ./tools/git-sync-deps
deps = {
"buildtools" : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@d55464fff7b09220a2b3f6571bf158c9f6163ec1",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@66bc9cfa00143312cc7545556041622a92745a91",
"third_party/externals/brotli" : "https://skia.googlesource.com/external/github.com/google/brotli.git@6d03dfbedda1615c4cba1211f8d81735575209c8",
"third_party/externals/d3d12allocator" : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
# Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@f51ecbb7b732209bf1b3f101c449dbea4c3d2e79",
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@94ceac3a5f35c7a692a0b880f414f3f848ddde6a",
"third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@e2d024354e11cc6b041b0cff032d73f0c7e43a07",
"third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0bad08bb207bbfc1d6f3bbc82b9242b0c50e5794",
"third_party/externals/abseil-cpp" : "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git@334aca32051ef6ede2711487acf45d959e9bdffc",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@b055c9b483e70ecd57b3cf7204db21f5a06f9ffe",
"third_party/externals/emsdk" : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@a896e3d066448b3530dbcaa48869fafefd738f57",
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@441f98d02deafd9b090aea568282b28f66a50e36",
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@f42ce25563b73fed0123d18a2556b9ba01d2c76b",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@4cfc6d8e173e800df086d7be078da2e8c5cfca19",
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@a46424228f0998a72c715f32e18dca8a7a764c1f",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@b74a7ecc93e283d059df51ee4f46961a782bcdb8",
"third_party/externals/highway" : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@364118a1d9da24bb5b770ac3d762ac144d6da5a4",
"third_party/externals/icu4x" : "https://chromium.googlesource.com/external/github.com/unicode-org/icu4x.git@bcf4f7198d4dc5f3127e84a6ca657c88e7d07a13",
"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@55d35d8387c15bf0cfd71861df67af8cfbda7456",
"third_party/externals/libavif" : "https://skia.googlesource.com/external/github.com/AOMediaCodec/libavif.git@55aab4ac0607ab651055d354d64c4615cf3d8000",
"third_party/externals/libgav1" : "https://chromium.googlesource.com/codecs/libgav1.git@5cf722e659014ebaf2f573a6dd935116d36eadf1",
"third_party/externals/libgrapheme" : "https://skia.googlesource.com/external/github.com/FRIGN/libgrapheme/@c0cab63c5300fa12284194fbef57aa2ed62a94c0",
"third_party/externals/libjpeg-turbo" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@ed683925e4897a84b3bffc5c1414c85b97a129a3",
"third_party/externals/libjxl" : "https://chromium.googlesource.com/external/gitlab.com/wg1/jpeg-xl.git@a205468bc5d3a353fb15dae2398a101dff52f2d3",
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@144b348e072a78e8130ed0acc452c9f039a67bf2",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@2af26267cdfcb63a88e5c74a85927a12d6ca1d76",
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@ed217e3e601d8e462f7fd1e04bed43ac42212429",
"third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@845d5476a866141ba35ac133f856fa62f0b7445f",
"third_party/externals/libyuv" : "https://chromium.googlesource.com/libyuv/libyuv.git@d248929c059ff7629a85333699717d7a677d8d96",
"third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",
"third_party/externals/oboe" : "https://chromium.googlesource.com/external/github.com/google/oboe.git@b02a12d1dd821118763debec6b83d00a8a0ee419",
"third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553",
"third_party/externals/perfetto" : "https://android.googlesource.com/platform/external/perfetto@93885509be1c9240bc55fa515ceb34811e54a394",
"third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406",
"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@62c59c41e194c288c06739788bb0aad3c86b19bf",
"third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@da334852e70510d259bfa8cbaa7c5412966b2f41",
"third_party/externals/vulkanmemoryallocator" : "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@a6bfc237255a6bac1513f7c1ebde6d8aed6b5191",
# vulkan-deps is a meta-repo containing several interdependent Khronos Vulkan repositories.
# When the vulkan-deps revision is updated, those repos (spirv-*, vulkan-*) should be updated as well.
"third_party/externals/vulkan-deps" : "https://chromium.googlesource.com/vulkan-deps@8072102bca4aa465fd0f475d741211fd3524b7b9",
"third_party/externals/vulkan-deps" : "https://chromium.googlesource.com/vulkan-deps@a06b82c306ee85326c5d02518b88fbee434a34a0",
"third_party/externals/spirv-cross" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
"third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@4f7b471f1a66b6d06462cd4ba57628cc0cd087d7",
"third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@ade1f7cfd7dbe41f30e19dc11cc168a1aa67a34a",
"third_party/externals/vello" : "https://skia.googlesource.com/external/github.com/linebender/vello.git@74715ee4650ec3f4483ccc86540b32d15d5bfaa3",
"third_party/externals/vulkan-headers" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers@cfebfc96b2b0bce93da7d12f2c14cc01793ae25c",
"third_party/externals/vulkan-tools" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools@c5da01ee0af9766c2992d6757e8f31ef50117b09",
"third_party/externals/vulkan-utility-libraries": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@0519e66f426d13d06b4172f29a5476831382f79c",
"third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@49a1fceb9b1d087f3c25ad5ec077bb0e46231297",
"third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@199038f10cbe56bf7cbfeb5472eb0a25af2f09f5",
"third_party/externals/vello" : "https://skia.googlesource.com/external/github.com/linebender/vello.git@6938a2893d6a2ba658709d1d04720f6c6033700f",
"third_party/externals/vulkan-headers" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers@5677bafb820e476441e9e1f745371b72133407d3",
"third_party/externals/vulkan-tools" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools@df8e710224f563a04b7db2680f72d31619c4b259",
"third_party/externals/vulkan-utility-libraries": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries@358a107a6ff284906dcccbabe5b0183c03fd85b6",
"third_party/externals/unicodetools" : "https://chromium.googlesource.com/external/github.com/unicode-org/unicodetools@66a3fa9dbdca3b67053a483d130564eabc5fe095",
#"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
"third_party/externals/wuffs" : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@e3f919ccfe3ef542cfc983a82146070258fb57f8",
Expand Down
6 changes: 6 additions & 0 deletions Source/ThirdParty/skia/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ def _CheckBazelBUILDFiles(input_api, output_api):
'Add "skia_cc_library" to load("//bazel:macros.bzl", ...)')
% affected_file_path
))
if 'default_applicable_licenses' not in contents:
# See https://opensource.google/documentation/reference/thirdparty/new_license_rules
results.append(output_api.PresubmitError(
('%s needs to have\npackage(default_applicable_licenses = ["//:license"])\n'+
'to comply with G3 policies') % affected_file_path
))
return results


Expand Down
2 changes: 1 addition & 1 deletion Source/ThirdParty/skia/README.WebKit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This directory contains a copy of Skia from the official repository.

- URL: https://skia.googlesource.com/skia
- Commit: 5b62c0022f92b3fea4fd9b99e1e517fe002cf15a
- Commit: 2a7830d74a8b596a51a7e5c8eb78243ca4e5faf2

The simplest way of updating its contents is to re-create the directory
from scratch, and restoring the needed files with Git. Example commands:
Expand Down

0 comments on commit ed896fe

Please sign in to comment.