-
Notifications
You must be signed in to change notification settings - Fork 51
M145 public #357
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
HinTak
wants to merge
86
commits into
kyamagu:main
Choose a base branch
from
HinTak:m145-public
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
M145 public #357
Conversation
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
….0-457-ga46d5732d9)
….40.0-787-g0f94c19331)
… freetype compatibility." This reverts commit bfccc58.
….40.0-795-gcbc694239b)
….40.0-1240-gb57e04d1c7)
…, and removed.
It was deprecated in m139, and gone in m140.
Milestone 139
-------------
* `SkFontMgr_New_FontConfig` with 1 parameter has been deprecated and will be removed in a future
release. Clients will need to call the other version providing an SkFontScanner (e.g.
`SkFontScanner_Make_FreeType()`)
Conflicts:
src/skia/Font.cpp
…favor of the `SkRecorder*` version.
Milestone 140
-------------
* `SkImage::isValid(GrRecordingContext*)` has been deprecated in favor of the `SkRecorder*` version.
To migrate do something like `image->isValid(ctx->asRecorder())`.
`SkImage::makeSubset(GrDirectContext*, ...)` has been deprecated in favor of the `SkRecorder*`
version. To migrate, do something like `image->makeSubset(ctx->asRecorder, ..., {})`
`SkImage::makeColorSpace(GrDirectContext*, ...)` has been deprecated in favor of the `SkRecorder*`
version. To migrate, do something like `image->makeColorSpace(ctx->asRecorder, ..., {})`
`SkImage::makeColorTypeAndColorSpace(GrDirectContext*, ...)` has been deprecated in favor of the
`SkRecorder*` version. To migrate, do something like
`image->makeColorTypeAndColorSpace(ctx->asRecorder, ..., {})`
In the case you are working with CPU-backed images, `skcpu::Recorder::TODO()` should work until
a `skcpu::Context` and `skcpu::Recorder` can be used properly.
…atrix.inverse()
m139:
bool setPolyToPoly(const SkPoint src[], const SkPoint dst[], int count);
m140:
bool setPolyToPoly(SkSpan<const SkPoint> src, SkSpan<const SkPoint> dst);
Before m140, only (deprecated):
[[nodiscard]] bool invert(SkMatrix* inverse) const;
Added in m140:
std::optional<SkMatrix> invert() const;
Old:
bool getSegment(SkScalar startD, SkScalar stopD, SkPath* dst, bool startWithMoveTo);
Newly added:
bool getSegment(SkScalar startD, SkScalar stopD, SkPathBuilder* dst, bool startWithMoveTo);
Old:
bool transform(const SkMatrix& matrix, SkRRect* dst) const;
Newly added:
std::optional<SkRRect> transform(const SkMatrix& matrix) const;
Old:
bool getBoundaryPath(SkPath* path) const;
Newly added:
SkPath getBoundaryPath() const;
was:
bool applyToPath(SkPath* dst, const SkPath& src) const;
m140:
bool applyToPath(SkPathBuilder* dst, const SkPath& src) const;
This reverts commit cd8af0c. Should not be needed in m140.
…nvaskit/0.40.0-2246-gda51f0d60e)
Upstream making SkPath immutable at m143 is going to break a lot of user code. Try to revert the change locally for now. Fixes kyamagu#354
commit c501c727a00796f7b8a269680e41304155bc0b16
Author: Michael Reed <mike@reedtribe.org>
Date: Sat Oct 11 12:13:47 2025 -0400
Can we remove SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
Change-Id: I332cd3dae1584812768445388482f92df0d65324
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1072416
Reviewed-by: Florin Malita <fmalita@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Kaylee Lubick <kjlubick@google.com>
Commit-Queue: Mike Reed <mike@reedtribe.org>
m143: &SkPath::transform with SkApplyPerspectiveClip withdrawn with SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
m143: &SkMatrix::mapRect with SkApplyPerspectiveClip withdrawn with SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP
In m142, SkApplyPerspectiveClip is not used by either (a not-used argument), and supported by extra
SK_SUPPORT_LEGACY_APPLYPERSPECTIVECLIP. This was removed in m143.
diff between m142 and m143, include/core/SkPath.h:
- static SkPath Rect(const SkRect&, SkPathDirection = SkPathDirection::kDefault,
+ static SkPath Rect(const SkRect&, SkPathFillType, SkPathDirection = SkPathDirection::kDefault,
unsigned startIndex = 0);
+ static SkPath Rect(const SkRect& r, SkPathDirection direction = SkPathDirection::kDefault,
+ unsigned startIndex = 0) {
+ return Rect(r, SkPathFillType::kDefault, direction, startIndex);
+ }
diff include/core/SkPath.h between m142 and m143:
- bool contains(SkScalar x, SkScalar y) const;
+ bool contains(SkPoint point) const;
+
+ // deprecated
+ bool contains(SkScalar x, SkScalar y) const {
+ return this->contains({x, y});
+ }
See actions/runner-images#13046 macOS 13 is fully unsupported by December 4th 2025 for GitHub.
Hunk kyamagu#2 for "BUILD.gn" needs extra identation of 2 spaces in m143.
diff between m143 and m144 of include/svg/SkSVGCanvas.h:
+ static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkWStream*, Options opts);
+#if !defined(SK_DISABLE_LEGACY_SVG_FACTORIES)
static std::unique_ptr<SkCanvas> Make(const SkRect& bounds, SkWStream*, uint32_t flags = 0);
+#endif
--- skia-m143/include/gpu/ganesh/gl/GrGLBackendSurface.h 2025-12-08 00:11:34.000000000 +0000
+++ skia-m144/include/gpu/ganesh/gl/GrGLBackendSurface.h 2025-12-08 00:15:16.000000000 +0000
@@ -20,8 +20,14 @@
namespace skgpu { enum class Mipmapped : bool; }
namespace GrBackendFormats {
+
+// DEPRECATED: Prefer MakeGL(format) for GL_TEXTURE_2D targets and MakeGLExternal() for
+// GL_TEXTURE_EXTERNAL targets.
SK_API GrBackendFormat MakeGL(GrGLenum format, GrGLenum target);
+SK_API GrBackendFormat MakeGL(GrGLenum format); // For GL_TEXTURE_2D textures
+SK_API GrBackendFormat MakeGLExternal(); // For GL_TEXTURE_EXTERNAL textures
+
SK_API GrGLFormat AsGLFormat(const GrBackendFormat&);
SK_API GrGLenum AsGLFormatEnum(const GrBackendFormat&);
} // namespace GrBackendFormats
…everse-apply to m144 cleanly.
Reversing "defines.remove('SK_DISABLE_LEGACY_NONCONST_SERIAL_PROCS')" also is likely strictly-speaking
incorrect: what we want is really removing the 'defines.remove("SK_HIDE_PATH_EDIT_METHODS")' line
while keeping the rest. It likely does not matter.
…canvaskit/0.40.0-3020-g2ab8add5be)
SK_DISABLE_LEGACY_NONCONST_ENCODED_IMAGE_DATA is gone in m144:
--- skia-m144/include/core/SkImage.h 2025-12-08 00:15:16.000000000 +0000
+++ skia-m145/include/core/SkImage.h 2026-01-18 04:38:15.000000000 +0000
@@ -739,11 +739,7 @@
example: https://fiddle.skia.org/c/@Image_refEncodedData
*/
-#if defined(SK_DISABLE_LEGACY_NONCONST_ENCODED_IMAGE_DATA)
sk_sp<const SkData> refEncodedData() const;
-#else
- sk_sp<SkData> refEncodedData() const;
-#endif
struct RequiredProperties {
bool fMipmapped = false;
…pendFloatArray
The prototype has changed:
- void appendFloatArray(const char* owner,
- const char* name,
- const std::vector<float>& value);
+ void appendFloatArray(const char* owner, const char* name, SkSpan<const float> value);
commit 9cd8adae4d5253da322f04ceef1dafaa3e6847a8
Author: Ben Wagner <bungeman@google.com>
Date: Wed Jan 7 15:23:18 2026 -0500
[pdf] Value owning AttributeList::appendTextString
The existing appendTextString is efficient in that it does not make a
copy of the `value` string, but also add a version that takes an
SkString so that ownership can be passed.
Change appendFloatArray and appendNodeIdArray to take SkSpan instead of
std::vector&.
Document that for all `const char*` parameters the attribute will hold
the pointer and not make a copy and for how long the pointer must remain
valid. Document that all other information is copied into the attribute.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This should build and run tests until #350 . The breakage in #354 turns out to be quite big - needs to do 5 reversions, some quite large.