Skip to content
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

Jump to bottom

fix(🤖): don't try to resize if the surface has been deleted #2467

Closed
wants to merge 4 commits into from
Closed

fix(🤖): don't try to resize if the surface has been deleted #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0c3f34
don't resize if the surface is deleted
wcandillon Jun 10, 2024
3610396
Address threading issues in registerView
wcandillon Jun 10, 2024
6e71a98
Merge branch 'main' into surfaceSizeChanged
wcandillon Jun 11, 2024
8084e8c
Merge branch 'main' into surfaceSizeChanged
wcandillon Jun 11, 2024
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
5 changes: 5 additions & 0 deletions package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ void RNSkOpenGLCanvasProvider::surfaceSizeChanged(int width, int height) {
return;
}

if (_surfaceHolder == nullptr) {
// No surface holder, nothing to do
return;
}

// Recreate RenderContext surface based on size change???
_surfaceHolder->resize(width, height);

Expand Down
2 changes: 1 addition & 1 deletion package/cpp/rnskia/RNSkJsiViewApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ class RNSkJsiViewApi : public RNJsi::JsiHostObject,
* @return The callback info object for the requested view
*/
RNSkViewInfo *getEnsuredViewInfo(size_t nativeId) {
std::lock_guard<std::mutex> lock(_mutex);
if (_viewInfos.count(nativeId) == 0) {
RNSkViewInfo info;
std::lock_guard<std::mutex> lock(_mutex);
_viewInfos.emplace(nativeId, info);
}
return &_viewInfos.at(nativeId);
Expand Down
Loading