Skip to content

fix(⬆️): update to Skia m145 #3655

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.

Sign up for GitHub

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
wcandillon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(⬆️): update to Skia m145 #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
224b226
:arrow_up:
wcandillon Jan 28, 2026
666a4c8
:wrench:
wcandillon Jan 28, 2026
badf8da
:green_heart:
wcandillon Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-skia.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
if: startsWith(matrix.target, 'android')
uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
with:
ndk-version: r22b
ndk-version: r27c

- name: Setup Ninja
uses: seanmiddleditch/gha-setup-ninja@master
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "externals/skia"]
path = externals/skia
url = https://chromium.googlesource.com/skia/
branch = chrome/m144
branch = chrome/m145
[submodule "externals/depot_tools"]
path = externals/depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
2 changes: 1 addition & 1 deletion externals/skia
Open in desktop
Submodule skia updated from ee20d5 to 2ab8ad
15 changes: 14 additions & 1 deletion packages/skia/cpp/api/JsiSkParagraphBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
#pragma clang diagnostic ignored "-Wdocumentation"

#include "modules/skparagraph/include/ParagraphBuilder.h"
#include "modules/skunicode/include/SkUnicode.h"

#ifdef __APPLE__
#include "modules/skunicode/include/SkUnicode_libgrapheme.h"
#else
#include "modules/skunicode/include/SkUnicode_icu.h"
#endif

#pragma clang diagnostic pop

Expand Down Expand Up @@ -125,7 +132,13 @@ class JsiSkParagraphBuilder : public JsiSkHostObject {
_fontCollection->setAssetFontManager(fontManager);
}
_fontCollection->enableFontFallback();
_builder = para::ParagraphBuilder::make(paragraphStyle, _fontCollection);
#ifdef __APPLE__
auto unicode = SkUnicodes::Libgrapheme::Make();
#else
auto unicode = SkUnicodes::ICU::Make();
#endif
_builder =
para::ParagraphBuilder::make(paragraphStyle, _fontCollection, unicode);
}

private:
Expand Down
188 changes: 119 additions & 69 deletions packages/skia/cpp/api/JsiSkPath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#pragma clang diagnostic ignored "-Wdocumentation"

#include "include/core/SkPath.h"
#include "include/core/SkPathBuilder.h"
#include "include/core/SkPathEffect.h"
#include "include/core/SkPathTypes.h"
#include "include/core/SkPathUtils.h"
Expand Down Expand Up @@ -59,19 +60,23 @@
auto mode = count > 2 && arguments[2].isBool() && arguments[2].getBool()
? SkPath::kExtend_AddPathMode
: SkPath::kAppend_AddPathMode;
SkPathBuilder builder(*getObject());
if (matrix == nullptr) {
getObject()->addPath(*src, mode);
builder.addPath(*src, mode);
} else {
getObject()->addPath(*src, *matrix, mode);
builder.addPath(*src, *matrix, mode);
}
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(addArc) {
auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
auto start = arguments[1].asNumber();
auto sweep = arguments[2].asNumber();
getObject()->addArc(*rect, start, sweep);
SkPathBuilder builder(*getObject());
builder.addArc(*rect, start, sweep);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -82,7 +87,9 @@
direction = SkPathDirection::kCCW;
}
unsigned startIndex = count < 3 ? 0 : arguments[2].asNumber();
auto result = getObject()->addOval(*rect, direction, startIndex);
SkPathBuilder builder(*getObject());
builder.addOval(*rect, direction, startIndex);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -97,8 +104,9 @@
runtime, jsiPoints.getValueAtIndex(runtime, i).asObject(runtime));
points.push_back(*point.get());
}
auto p = SkSpan(points.data(), points.size());
getObject()->addPoly(p, close);
SkPathBuilder builder(*getObject());
builder.addPolygon({points.data(), points.size()}, close);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -108,7 +116,9 @@
if (count >= 2 && arguments[1].getBool()) {
direction = SkPathDirection::kCCW;
}
getObject()->addRect(*rect, direction);
SkPathBuilder builder(*getObject());
builder.addRect(*rect, direction);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -118,7 +128,9 @@
if (count >= 2 && arguments[1].getBool()) {
direction = SkPathDirection::kCCW;
}
getObject()->addRRect(*rrect, direction);
SkPathBuilder builder(*getObject());
builder.addRRect(*rrect, direction);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -127,47 +139,55 @@
auto start = arguments[1].asNumber();
auto sweep = arguments[2].asNumber();
auto forceMoveTo = arguments[3].getBool();
getObject()->arcTo(*rect, start, sweep, forceMoveTo);
SkPathBuilder builder(*getObject());
builder.arcTo(*rect, start, sweep, forceMoveTo);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(arcToRotated) {
auto rx = arguments[0].asNumber();
auto ry = arguments[1].asNumber();
auto xAxisRotate = arguments[2].asNumber();
SkScalar rx = arguments[0].asNumber();
SkScalar ry = arguments[1].asNumber();
SkScalar xAxisRotate = arguments[2].asNumber();
auto useSmallArc = arguments[3].getBool();
auto arcSize = useSmallArc ? SkPath::ArcSize::kSmall_ArcSize
: SkPath::ArcSize::kLarge_ArcSize;
auto arcSize = useSmallArc ? SkPathBuilder::ArcSize::kSmall_ArcSize
: SkPathBuilder::ArcSize::kLarge_ArcSize;
auto sweep =
arguments[4].getBool() ? SkPathDirection::kCCW : SkPathDirection::kCW;
auto x = arguments[5].asNumber();
auto y = arguments[6].asNumber();
getObject()->arcTo(rx, ry, xAxisRotate, arcSize, sweep, x, y);
SkScalar x = arguments[5].asNumber();
SkScalar y = arguments[6].asNumber();
SkPathBuilder builder(*getObject());
builder.arcTo({rx, ry}, xAxisRotate, arcSize, sweep, {x, y});
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(rArcTo) {
auto rx = arguments[0].asNumber();
auto ry = arguments[1].asNumber();
auto xAxisRotate = arguments[2].asNumber();
SkScalar rx = arguments[0].asNumber();
SkScalar ry = arguments[1].asNumber();
SkScalar xAxisRotate = arguments[2].asNumber();
auto useSmallArc = arguments[3].getBool();
auto arcSize = useSmallArc ? SkPath::ArcSize::kSmall_ArcSize
: SkPath::ArcSize::kLarge_ArcSize;
auto arcSize = useSmallArc ? SkPathBuilder::ArcSize::kSmall_ArcSize
: SkPathBuilder::ArcSize::kLarge_ArcSize;
auto sweep =
arguments[4].getBool() ? SkPathDirection::kCCW : SkPathDirection::kCW;
auto x = arguments[5].asNumber();
auto y = arguments[6].asNumber();
getObject()->rArcTo(rx, ry, xAxisRotate, arcSize, sweep, x, y);
SkScalar x = arguments[5].asNumber();
SkScalar y = arguments[6].asNumber();
SkPathBuilder builder(*getObject());
builder.rArcTo({rx, ry}, xAxisRotate, arcSize, sweep, {x, y});

Check failure on line 177 in packages/skia/cpp/api/JsiSkPath.h

View workflow job for this annotation

GitHub Actions / build-test-ios-graphite 

too few arguments to function call, expected 7, have 5
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(arcToTangent) {
auto x1 = arguments[0].asNumber();
auto y1 = arguments[1].asNumber();
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
auto r = arguments[4].asNumber();
getObject()->arcTo(x1, y1, x2, y2, r);
SkScalar x1 = arguments[0].asNumber();
SkScalar y1 = arguments[1].asNumber();
SkScalar x2 = arguments[2].asNumber();
SkScalar y2 = arguments[3].asNumber();
SkScalar r = arguments[4].asNumber();
SkPathBuilder builder(*getObject());
builder.arcTo({x1, y1}, {x2, y2}, r);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -192,7 +212,9 @@
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
auto w = arguments[4].asNumber();
getObject()->conicTo(x1, y1, x2, y2, w);
SkPathBuilder builder(*getObject());
builder.conicTo(x1, y1, x2, y2, w);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -202,7 +224,9 @@
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
auto w = arguments[4].asNumber();
getObject()->rConicTo(x1, y1, x2, y2, w);
SkPathBuilder builder(*getObject());
builder.rConicTo(x1, y1, x2, y2, w);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand Down Expand Up @@ -266,7 +290,9 @@

JSI_HOST_FUNCTION(transform) {
auto m3 = *JsiSkMatrix::fromValue(runtime, arguments[0]);
getObject()->transform(m3);
SkPathBuilder builder(*getObject());
builder.transform(m3);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand Down Expand Up @@ -357,56 +383,71 @@
JSI_HOST_FUNCTION(offset) {
SkScalar dx = arguments[0].asNumber();
SkScalar dy = arguments[1].asNumber();
getObject()->offset(dx, dy);
SkPathBuilder builder(*getObject());
builder.transform(SkMatrix::Translate(dx, dy));
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(moveTo) {
SkScalar x = arguments[0].asNumber();
SkScalar y = arguments[1].asNumber();
getObject()->moveTo(x, y);
SkPathBuilder builder(*getObject());
builder.moveTo(x, y);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(rMoveTo) {
SkScalar x = arguments[0].asNumber();
SkScalar y = arguments[1].asNumber();
getObject()->rMoveTo(x, y);
SkPathBuilder builder(*getObject());
builder.rMoveTo(x, y);

Check failure on line 405 in packages/skia/cpp/api/JsiSkPath.h

View workflow job for this annotation

GitHub Actions / build-test-ios-graphite 

too many arguments to function call, expected single argument 'pt', have 2 arguments
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(lineTo) {
SkScalar x = arguments[0].asNumber();
SkScalar y = arguments[1].asNumber();
getObject()->lineTo(x, y);
SkPathBuilder builder(*getObject());
builder.lineTo(x, y);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(rLineTo) {
SkScalar x = arguments[0].asNumber();
SkScalar y = arguments[1].asNumber();
getObject()->rLineTo(x, y);
SkPathBuilder builder(*getObject());
builder.rLineTo(x, y);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(cubicTo) {
auto x1 = arguments[0].asNumber();
auto y1 = arguments[1].asNumber();
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
auto x3 = arguments[4].asNumber();
auto y3 = arguments[5].asNumber();
getObject()->cubicTo(x1, y1, x2, y2, x3, y3);
SkScalar x1 = arguments[0].asNumber();
SkScalar y1 = arguments[1].asNumber();
SkScalar x2 = arguments[2].asNumber();
SkScalar y2 = arguments[3].asNumber();
SkScalar x3 = arguments[4].asNumber();
SkScalar y3 = arguments[5].asNumber();
SkPathBuilder builder(*getObject());
builder.cubicTo(x1, y1, x2, y2, x3, y3);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(rCubicTo) {
auto x1 = arguments[0].asNumber();
auto y1 = arguments[1].asNumber();
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
auto x3 = arguments[4].asNumber();
auto y3 = arguments[5].asNumber();
getObject()->rCubicTo(x1, y1, x2, y2, x3, y3);
SkScalar x1 = arguments[0].asNumber();
SkScalar y1 = arguments[1].asNumber();
SkScalar x2 = arguments[2].asNumber();
SkScalar y2 = arguments[3].asNumber();
SkScalar x3 = arguments[4].asNumber();
SkScalar y3 = arguments[5].asNumber();
SkPathBuilder builder(*getObject());
builder.rCubicTo(x1, y1, x2, y2, x3, y3);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -416,33 +457,40 @@
}

JSI_HOST_FUNCTION(rewind) {
getObject()->rewind();
// rewind() was removed in m145, use reset() instead
getObject()->reset();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(quadTo) {
auto x1 = arguments[0].asNumber();
auto y1 = arguments[1].asNumber();
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
getObject()->quadTo(x1, y1, x2, y2);
SkScalar x1 = arguments[0].asNumber();
SkScalar y1 = arguments[1].asNumber();
SkScalar x2 = arguments[2].asNumber();
SkScalar y2 = arguments[3].asNumber();
SkPathBuilder builder(*getObject());
builder.quadTo(x1, y1, x2, y2);
*getObject() = builder.detach();
return jsi::Value::undefined();
}

JSI_HOST_FUNCTION(rQuadTo) {
auto x1 = arguments[0].asNumber();
auto y1 = arguments[1].asNumber();
auto x2 = arguments[2].asNumber();
auto y2 = arguments[3].asNumber();
getObject()->rQuadTo(x1, y1, x2, y2);
SkScalar x1 = arguments[0].asNumber();
SkScalar y1 = arguments[1].asNumber();
SkScalar x2 = arguments[2].asNumber();
SkScalar y2 = arguments[3].asNumber();
SkPathBuilder builder(*getObject());
builder.rQuadTo(x1, y1, x2, y2);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

JSI_HOST_FUNCTION(addCircle) {
auto x = arguments[0].asNumber();
auto y = arguments[1].asNumber();
auto r = arguments[2].asNumber();
getObject()->addCircle(x, y, r);
SkScalar x = arguments[0].asNumber();
SkScalar y = arguments[1].asNumber();
SkScalar r = arguments[2].asNumber();
SkPathBuilder builder(*getObject());
builder.addCircle(x, y, r);
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand All @@ -456,7 +504,9 @@
}

JSI_HOST_FUNCTION(close) {
getObject()->close();
SkPathBuilder builder(*getObject());
builder.close();
*getObject() = builder.detach();
return thisValue.getObject(runtime);
}

Expand Down
Loading
Loading