Skip to content

Commit f2fe0fa

Browse files
wcandillonwcandillon
authored
fix(💣): fix race condition in scene graph destructor (#3476)
1 parent 62524c2 commit f2fe0fa

File tree

6 files changed

+84
-100
lines changed

6 files changed

+84
-100
lines changed

‎apps/example/ios/Podfile.lock‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,77 +2162,77 @@ SPEC CHECKSUMS:
21622162
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
21632163
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
21642164
hermes-engine: b417d2b2aee3b89b58e63e23a51e02be91dc876d
2165-
RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
2165+
RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
21662166
RCTDeprecation: b2eecf2d60216df56bc5e6be5f063826d3c1ee35
21672167
RCTRequired: 78522de7dc73b81f3ed7890d145fa341f5bb32ea
21682168
RCTTypeSafety: c135dd2bf50402d87fd12884cbad5d5e64850edd
21692169
React: b229c49ed5898dab46d60f61ed5a0bfa2ee2fadb
21702170
React-callinvoker: 2ac508e92c8bd9cf834cc7d7787d94352e4af58f
2171-
React-Core: 13cdd1558d0b3f6d9d5a22e14d89150280e79f02
2172-
React-CoreModules: b07a6744f48305405e67c845ebf481b6551b712a
2173-
React-cxxreact: 1055a86c66ac35b4e80bd5fb766aed5f494dfff4
2171+
React-Core: 325b4f6d9162ae8b9a6ff42fe78e260eb124180d
2172+
React-CoreModules: 558041e5258f70cd1092f82778d07b8b2ff01897
2173+
React-cxxreact: 8fff17cbe76e6a8f9991b59552e1235429f9c74b
21742174
React-debug: 0a5fcdbacc6becba0521e910c1bcfdb20f32a3f6
2175-
React-defaultsnativemodule: 4bb28fc97fee5be63a9ebf8f7a435cfe8ba69459
2176-
React-domnativemodule: b36a11c2597243d7563985028c51ece988d8ae33
2177-
React-Fabric: afc561718f25b2cd800b709d934101afe376a12c
2178-
React-FabricComponents: f4e0a4e18a27bf6d39cbf2a0b42f37a92fa4e37f
2179-
React-FabricImage: 37d8e8b672eda68a19d71143eb65148084efb325
2175+
React-defaultsnativemodule: 618dc50a0fad41b489997c3eb7aba3a74479fd14
2176+
React-domnativemodule: 7ba599afb6c2a7ec3eb6450153e2efe0b8747e9a
2177+
React-Fabric: 252112089d2c63308f4cbfade4010b6606db67d1
2178+
React-FabricComponents: 3c0f75321680d14d124438ab279c64ec2a3d13c4
2179+
React-FabricImage: 728b8061cdec2857ca885fd605ee03ad43ffca98
21802180
React-featureflags: 19682e02ef5861d96b992af16a19109c3dfc1200
2181-
React-featureflagsnativemodule: d7cddf6d907b4e5ab84f9e744b7e88461656e48c
2182-
React-graphics: b0f78580cdaf5800d25437e3d41cc6c3d83b7aea
2183-
React-hermes: 71186f872c932e4574d5feb3ed754dda63a0b3bd
2184-
React-idlecallbacksnativemodule: dd2af19cdd3bc55149d17a2409ed72b694dfbe9c
2185-
React-ImageManager: a77dde8d5aa6a2b6962c702bf3a47695ef0aa32b
2186-
React-jserrorhandler: 9c14e89f12d5904257a79aaf84a70cd2e5ac07ba
2187-
React-jsi: 0775a66820496769ad83e629f0f5cce621a57fc7
2188-
React-jsiexecutor: 2cf5ba481386803f3c88b85c63fa102cba5d769e
2189-
React-jsinspector: 8052d532bb7a98b6e021755674659802fb140cc5
2190-
React-jsinspectortracing: bdd8fd0adcb4813663562e7874c5842449df6d8a
2191-
React-jsitracing: 2bab3bf55de3d04baf205def375fa6643c47c794
2192-
React-logger: 795cd5055782db394f187f9db0477d4b25b44291
2193-
React-Mapbuffer: 0502faf46cab8fb89cfc7bf3e6c6109b6ef9b5de
2194-
React-microtasksnativemodule: 663bc64e3a96c5fc91081923ae7481adc1359a78
2195-
react-native-safe-area-context: 286b3e7b5589795bb85ffc38faf4c0706c48a092
2196-
react-native-skia: 440cfe000ba2f25f03315d727c129cb976db7377
2197-
react-native-slider: 27263d134d55db948a4706f1e47d0ec88fb354dd
2198-
React-NativeModulesApple: 16fbd5b040ff6c492dacc361d49e63cba7a6a7a1
2199-
React-perflogger: ab51b7592532a0ea45bf6eed7e6cae14a368b678
2200-
React-performancetimeline: bc2e48198ec814d578ac8401f65d78a574358203
2181+
React-featureflagsnativemodule: 23528c7e7d50782b7ef0804168ba40bbaf1e86ab
2182+
React-graphics: fefe48f71bfe6f48fd037f59e8277b12e91b6be1
2183+
React-hermes: a9a0c8377627b5506ef9a7b6f60a805c306e3f51
2184+
React-idlecallbacksnativemodule: 7e2b6a3b70e042f89cd91dbd73c479bb39a72a7e
2185+
React-ImageManager: e3300996ac2e2914bf821f71e2f2c92ae6e62ae2
2186+
React-jserrorhandler: fa75876c662e5d7e79d6efc763fc9f4c88e26986
2187+
React-jsi: f3f51595cc4c089037b536368f016d4742bf9cf7
2188+
React-jsiexecutor: cca6c232db461e2fd213a11e9364cfa6fdaa20eb
2189+
React-jsinspector: 2bd4c9fddf189d6ec2abf4948461060502582bef
2190+
React-jsinspectortracing: a417d8a0ad481edaa415734b4dac81e3e5ee7dc6
2191+
React-jsitracing: 1ff7172c5b0522cbf6c98d82bdbb160e49b5804e
2192+
React-logger: 018826bfd51b9f18e87f67db1590bc510ad20664
2193+
React-Mapbuffer: 3c11cee7737609275c7b66bd0b1de475f094cedf
2194+
React-microtasksnativemodule: 843f352b32aacbe13a9c750190d34df44c3e6c2c
2195+
react-native-safe-area-context: 0f14bce545abcdfbff79ce2e3c78c109f0be283e
2196+
react-native-skia: 83ea407f6494e4a24a9c971cbfccedca4fe00e65
2197+
react-native-slider: 310d3f89edd6ca8344a974bfe83a29a3fbb60e5a
2198+
React-NativeModulesApple: 88433b6946778bea9c153e27b671de15411bf225
2199+
React-perflogger: 9e8d3c0dc0194eb932162812a168aa5dc662f418
2200+
React-performancetimeline: 5a2d6efef52bdcefac079c7baa30934978acd023
22012201
React-RCTActionSheet: 592674cf61142497e0e820688f5a696e41bf16dd
2202-
React-RCTAnimation: 8fbb8dba757b49c78f4db403133ab6399a4ce952
2203-
React-RCTAppDelegate: 7f88baa8cb4e5d6c38bb4d84339925c70c9ac864
2204-
React-RCTBlob: f89b162d0fe6b570a18e755eb16cbe356d3c6d17
2205-
React-RCTFabric: 8ad6d875abe6e87312cef90e4b15ef7f6bed72e6
2206-
React-RCTFBReactNativeSpec: 8c29630c2f379c729300e4c1e540f3d1b78d1936
2207-
React-RCTImage: ccac9969940f170503857733f9a5f63578e106e1
2208-
React-RCTLinking: d82427bbf18415a3732105383dff119131cadd90
2209-
React-RCTNetwork: 12ad4d0fbde939e00251ca5ca890da2e6825cc3c
2210-
React-RCTSettings: e7865bf9f455abf427da349c855f8644b5c39afa
2211-
React-RCTText: 2cdfd88745059ec3202a0842ea75a956c7d6f27d
2212-
React-RCTVibration: a3a1458e6230dfd64b3768ebc0a4aac430d9d508
2202+
React-RCTAnimation: e6d669872f9b3b4ab9527aab283b7c49283236b7
2203+
React-RCTAppDelegate: de2343fe08be4c945d57e0ecce44afcc7dd8fc03
2204+
React-RCTBlob: 3e2dce94c56218becc4b32b627fc2293149f798d
2205+
React-RCTFabric: cac2c033381d79a5956e08550b0220cb2d78ea93
2206+
React-RCTFBReactNativeSpec: d10ca5e0ccbfeac8c047361fedf8e4ac653887b6
2207+
React-RCTImage: dc04b176c022d12a8f55ae7a7279b1e091066ae0
2208+
React-RCTLinking: 88f5e37fe4f26fbc80791aa2a5f01baf9b9a3fd5
2209+
React-RCTNetwork: f213693565efbd698b8e9c18d700a514b49c0c8e
2210+
React-RCTSettings: a2d32a90c45a3575568cad850abc45924999b8a5
2211+
React-RCTText: 54cdcd1cbf6f6a91dc6317f5d2c2b7fc3f6bf7a0
2212+
React-RCTVibration: 11dae0e7f577b5807bb7d31e2e881eb46f854fd4
22132213
React-rendererconsistency: 64e897e00d2568fd8dfe31e2496f80e85c0aaad1
2214-
React-rendererdebug: a3f6d3ae7d2fa0035885026756281c07ee32479e
2214+
React-rendererdebug: 41ce452460c44bba715d9e41d5493a96de277764
22152215
React-rncore: 58748c2aa445f56b99e5118dad0aedb51c40ce9f
2216-
React-RuntimeApple: f0fda7bacabd32daa099cfda8f07466c30acd149
2217-
React-RuntimeCore: 683ee0b6a76d4b4bf6fbf83a541895b4887cc636
2216+
React-RuntimeApple: 7785ed0d8ae54da65a88736bb63ca97608a6d933
2217+
React-RuntimeCore: 6029ea70bc77f98cfd43ebe69217f14e93ba1f12
22182218
React-runtimeexecutor: a188df372373baf5066e6e229177836488799f80
2219-
React-RuntimeHermes: 907c8e9bec13ea6466b94828c088c24590d4d0b6
2220-
React-runtimescheduler: a2e2a39125dd6426b5d8b773f689d660cd7c5f60
2219+
React-RuntimeHermes: a264609c28b796edfffc8ae4cb8fad1773ab948b
2220+
React-runtimescheduler: 23ec3a1e0fb1ec752d1a9c1fb15258c30bfc7222
22212221
React-timing: bb220a53a795ed57976a4855c521f3de2f298fe5
2222-
React-utils: 300d8bbb6555dcffaca71e7a0663201b5c7edbbc
2223-
ReactAppDependencyProvider: f2e81d80afd71a8058589e19d8a134243fa53f17
2224-
ReactCodegen: 50b6e45bbbef9b39d9798820cdbe87bfc7922e22
2225-
ReactCommon: 3d39389f8e2a2157d5c999f8fba57bd1c8f226f0
2226-
ReactNativeHost: e96154926221741f253f2c1ded13c6959c5c3d43
2227-
ReactTestApp-DevSupport: 6994b53b5b81139a8ce63e0776c726c95de079a1
2222+
React-utils: 3b054aaebe658fc710a8d239d0e4b9fd3e0b78f9
2223+
ReactAppDependencyProvider: a1fb08dfdc7ebc387b2e54cfc9decd283ed821d8
2224+
ReactCodegen: e232f8db3a40721044ec81b9388f95a7afaad36a
2225+
ReactCommon: 0c097b53f03d6bf166edbcd0915da32f3015dd90
2226+
ReactNativeHost: 1b6ccdcfc87bb31e772a5b3c3ca3b09c90954328
2227+
ReactTestApp-DevSupport: ea18f446cff64b6c9a3e28788600c82ecf51bde6
22282228
ReactTestApp-Resources: 1bd9ff10e4c24f2ad87101a32023721ae923bccf
2229-
RNGestureHandler: 66e593addd8952725107cfaa4f5e3378e946b541
2230-
RNReanimated: 858fe25904af44131b8b608a5005b64778609a6a
2231-
RNScreens: 0f01bbed9bd8045a8d58e4b46993c28c7f498f3c
2232-
RNSVG: 8588ee1ca9b2e6fd2c99466e35b3db0e9f81bb40
2229+
RNGestureHandler: dcb1b1db024f3744b03af56d132f4f72c4c27195
2230+
RNReanimated: d5f33d14a4d1da33a02d89124de233a64b3aaeaa
2231+
RNScreens: 790123c4a28783d80a342ce42e8c7381bed62db1
2232+
RNSVG: 8126581b369adf6a0004b6a6cab1a55e3002d5b0
22332233
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2234-
Yoga: 9b7fb56e7b08cde60e2153344fa6afbd88e5d99f
2234+
Yoga: afd04ff05ebe0121a00c468a8a3c8080221cb14c
22352235

22362236
PODFILE CHECKSUM: 87506345285a0371afb28b9c3e6daaa999c214f3
22372237

2238-
COCOAPODS: 1.15.2
2238+
COCOAPODS: 1.16.2

‎externals/depot_tools‎

Submodule depot_tools updated from abc5109 to 8a1ec6a

‎packages/skia/apple/SkiaCVPixelBufferUtils.mm‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@
3030
#include <TargetConditionals.h>
3131
#if TARGET_RT_BIG_ENDIAN
3232
#define FourCC2Str(fourcc) \
33-
(const char[]) { \
34-
*((char *)&fourcc), *(((char *)&fourcc) + 1), *(((char *)&fourcc) + 2), \
35-
*(((char *)&fourcc) + 3), 0 \
36-
}
33+
(const char[]){*((char *)&fourcc), *(((char *)&fourcc) + 1), \
34+
*(((char *)&fourcc) + 2), *(((char *)&fourcc) + 3), 0}
3735
#else
3836
#define FourCC2Str(fourcc) \
39-
(const char[]) { \
40-
*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2), \
41-
*(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0 \
42-
}
37+
(const char[]){*(((char *)&fourcc) + 3), *(((char *)&fourcc) + 2), \
38+
*(((char *)&fourcc) + 1), *(((char *)&fourcc) + 0), 0}
4339
#endif
4440

4541
// pragma MARK: TextureHolder

‎packages/skia/cpp/api/JsiSkCanvas.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,10 @@ class JsiSkCanvas : public JsiSkHostObject {
242242
}
243243

244244
JSI_HOST_FUNCTION(getTotalMatrix) {
245-
auto matrix = std::make_shared<JsiSkMatrix>(getContext(), _canvas->getTotalMatrix());
246-
return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, matrix, getContext());
245+
auto matrix =
246+
std::make_shared<JsiSkMatrix>(getContext(), _canvas->getTotalMatrix());
247+
return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, matrix,
248+
getContext());
247249
}
248250

249251
JSI_HOST_FUNCTION(drawPoints) {

‎packages/skia/cpp/api/recorder/Drawings.h‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -486,17 +486,6 @@ class ImageCmd : public Command {
486486
convertProperty(runtime, object, "rect", props.rect, variables);
487487
}
488488

489-
~ImageCmd() {
490-
if (props.image.has_value()) {
491-
auto image = props.image.value();
492-
if (image) {
493-
_context->runOnMainThread([image]() {
494-
// Image will be deleted when this lambda is destroyed on main thread
495-
});
496-
}
497-
}
498-
}
499-
500489
void draw(DrawingCtx *ctx) {
501490
auto [x, y, width, height, rect, fit, image, sampling] = props;
502491
if (image.has_value()) {
@@ -806,15 +795,6 @@ class PictureCmd : public Command {
806795
convertProperty(runtime, object, "picture", props.picture, variables);
807796
}
808797

809-
~PictureCmd() {
810-
auto picture = props.picture;
811-
if (picture) {
812-
_context->runOnMainThread([picture]() {
813-
// Picture will be deleted when this lambda is destroyed on main thread
814-
});
815-
}
816-
}
817-
818798
void draw(DrawingCtx *ctx) { ctx->canvas->drawPicture(props.picture); }
819799
};
820800

@@ -951,15 +931,6 @@ class AtlasCmd : public Command {
951931
convertProperty(runtime, object, "sampling", props.sampling, variables);
952932
}
953933

954-
~AtlasCmd() {
955-
auto image = props.image;
956-
if (image) {
957-
_context->runOnMainThread([image]() {
958-
// Image will be deleted when this lambda is destroyed on main thread
959-
});
960-
}
961-
}
962-
963934
void draw(DrawingCtx *ctx) {
964935
if (props.image) {
965936
// Validate transforms and sprites have the same size
@@ -990,4 +961,4 @@ class AtlasCmd : public Command {
990961
}
991962
};
992963

993-
} // namespace RNSkia
964+
} // namespace RNSkia

‎packages/skia/cpp/api/recorder/RNRecorder.h‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,22 @@ class Recorder {
2929
Variables variables;
3030

3131
Recorder() = default;
32-
~Recorder() = default;
32+
~Recorder() {
33+
if (!_context || commands.empty()) {
34+
return;
35+
}
36+
37+
auto context = _context;
38+
using CommandList = std::vector<std::unique_ptr<Command>>;
39+
auto pendingCommands = std::make_shared<CommandList>(std::move(commands));
40+
41+
context->runOnMainThread(
42+
[pendingCommands = std::move(pendingCommands)]() mutable {
43+
// Destroy the recorded commands on the main thread to ensure GPU
44+
// backed resources release safely.
45+
pendingCommands->clear();
46+
});
47+
}
3348

3449
void savePaint(jsi::Runtime &runtime, const jsi::Object &props,
3550
bool standalone) {
@@ -652,4 +667,4 @@ class Recorder {
652667
}
653668
};
654669

655-
} // namespace RNSkia
670+
} // namespace RNSkia

0 commit comments

Comments
 (0)