Skip to content

fix(canvas): release a canvas' surface reference on its own thread #4055

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
mlecoq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(canvas): release a canvas' surface reference on its own thread #4055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion packages/skia/cpp/api/JsiSkCanvas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <vector>

#include "JsiSkConverters.h"
#include "JsiSkDispatcher.h"
#include "JsiSkFont.h"
#include "JsiSkImage.h"
#include "JsiSkImageInfo.h"
Expand Down Expand Up @@ -607,16 +608,31 @@ class JsiSkCanvas : public JsiSkNativeObject<JsiSkCanvas> {
setCanvas(canvas);
}

~JsiSkCanvas() override {
// This destructor can run on any thread (GC), and a surface must be
// released on the thread it was created on.
if (_surface && _dispatcher) {
_dispatcher->run([surface = std::move(_surface)]() {});
}
}

void setCanvas(SkCanvas *canvas) { _canvas = canvas; }
SkCanvas *getCanvas() { return _canvas; }

// Optionally associate the canvas with its owning surface. This lets
// readPixels fall back to a surface snapshot on Graphite, which has no
// synchronous canvas readback.
void setSurface(sk_sp<SkSurface> surface) { _surface = std::move(surface); }
void setSurface(sk_sp<SkSurface> surface) {
_surface = std::move(surface);
// Called on the thread that owns the surface: keep its dispatcher, and
// drain it as the JsiSkImage constructor does.
_dispatcher = Dispatcher::getDispatcher();
_dispatcher->processQueue();
}

private:
SkCanvas *_canvas;
sk_sp<SkSurface> _surface;
std::shared_ptr<Dispatcher> _dispatcher;
};
} // namespace RNSkia
Loading