[skia-sync] Merge upstream chrome/m148#266
Closed
mattleibow wants to merge 3 commits into
Closed
Conversation
Since the layouts are passed by pointer in the `nextInChain` field, their addresses need to stay valid until the BindGroupLayout is created. With vector, if it ever grew, that would not remain the case. Since there are usually only 0 to 1 immutable samplers, this likely never happened (and also why it uses a built-in storage for 1). Also removes the include for vector and uses TArray (we had been mixing both throughout the file). Bug: 520514458 Fixed: 523531990 Change-Id: I44c9566c68ab0e6c6d659ea77a423ddc50d53c76 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1264157 Reviewed-by: Thomas Smith <thomsmit@google.com> Auto-Submit: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com> (cherry picked from commit 6a4be3a) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1266356
There was a data race in SkTypeface_Mac where `onOpenStream` and `onOpenExistingStream` would race to read/write `fStream`. While `onOpenStream` would begin initializing `fStream` on one thread, a separate thread could be calling `onOpenExistingStream` to try to read `fStream` before it was done initializing. The issue was resolved by applying a mutex on `fStream`. The cl introducing this bug (https://skia-review.git.corp.google.com/c/skia/+/204720) was focused on caching the typefaces received with a global process wide `gTFCache` to save on performance and memory. The issue arose in that since the SkTypeface_Mac could be accessed across threads, it became thread unsafe. A test was added to this CL but removed as it was too large and took too long. It helps us keep it in the patch history for reference. Bug: b/520535595 Bug: 520535595 Fixed: 524508854 Change-Id: Id28aeed3d67a5a5246d22681f2c7ab0e6c133558 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1264296 Commit-Queue: Alexis Cruz-Ayala <alexisdavidc@google.com> Reviewed-by: Kaylee Lubick <kjlubick@google.com> (cherry picked from commit ba3ee9b) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1274476
Collaborator
Author
|
Closing stale skia-sync validation branch/PR to give the refactored auto-skia-sync workflow a clean slate for a fresh run. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated upstream merge of
chrome/m148.Upstream merge
Merged
upstream/chrome/m148(46f2e16555cac1211f4087cf24728fd741ac6495) intoskia-sync/release-4.148.xon top of the existing release-line tip(
1a155bae3ac86db6d3efbd996f00e774b6a7b722, which was the m148 merge that shipped in 4.148.0).This is a release-line, bug-fix-only sync (current
m148== targetm148).Two upstream cherry-picks were applied since the last sync (
54851b68b):46f2e16555[m148] Resolved a Data Race on fStream in SkTypeface_Macsrc/ports/SkTypeface_mac_ct.{cpp,h}fStreamin the globalgTFCache3a90f6662a[graphite] Use stable collection for static bindingssrc/gpu/graphite/dawn/DawnGraphicsPipeline.cppConflicts resolved
None.
git merge --no-commit upstream/chrome/m148reported"Automatic merge went well; stopped before committing as requested" and
git diff --checkshowed zero conflict markers. The C API shim (
src/c/*.cpp,include/c/*.h,include/xamarin/**) was untouched by both upstream commits.C API fixes
None. Neither commit touches headers consumed by
src/c/orinclude/c/, so noshim adaptation was needed.
SK_C_INCREMENT(ininclude/c/sk_types.h) is unchanged.Build verification
dotnet cake --target=externals-linux --arch=x64succeeded (libSkiaSharp 14m04s,libHarfBuzzSharp 01m12s, total 15m28s). The resultinglibSkiaSharp.so.148.0.0links cleanly with the documented dependency set (
libfontconfig.so.1,libc++.so.1,libc++abi.so.1,libunwind.so.1, libm/libc/ld-linux).the actual cherry-pick (
SkTypeface_mac_ct) is Mac-only, so the multi-platform CIon the resulting PR is the source of truth for that file.
Items needing human attention
the Linux CI used for this sync. Verify the macOS leg of the resulting PR's
cross-platform build passes before merging.
metadata is untouched.
Created by skia-upstream-sync.