Skip to content

Share one JNI global reference between copies of a prepared text layout on Android #59592

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

Merged
meta-codesync merged 2 commits into from
Oct 29, 2026
Merged

Share one JNI global reference between copies of a prepared text layout on Android #59592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6d6fd0
Create one JNI global reference per prepared text layout on Android
hryhoriiK97 Oct 28, 2026
6860e24
Keep the FabricUIManager lookup out of this change
hryhoriiK97 Oct 29, 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
26 changes: 25 additions & 1 deletion ...r/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,31 @@ class TextLayoutManager;
*/
class TextLayoutManager {
public:
using PreparedTextLayout = SafeReleaseJniRef<jni::global_ref<JPreparedLayout>>;
/*
* A prepared layout's Java object. Copies share one JNI global reference, so
* returning a cached layout or storing it in state doesn't create another.
*/
class PreparedTextLayout {
public:
PreparedTextLayout() = default;
explicit PreparedTextLayout(jni::global_ref<JPreparedLayout> ref)
: ref_(std::make_shared<const SafeReleaseJniRef<jni::global_ref<JPreparedLayout>>>(std::move(ref)))
{
}

JPreparedLayout::javaobject get() const
{
return ref_ ? ref_->get() : nullptr;
}

explicit operator bool() const noexcept
{
return ref_ && *ref_;
}

private:
std::shared_ptr<const SafeReleaseJniRef<jni::global_ref<JPreparedLayout>>> ref_;
};

TextLayoutManager(const std::shared_ptr<const ContextContainer> &contextContainer);

Expand Down
8 changes: 7 additions & 1 deletion scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4012,7 +4012,13 @@ class facebook::react::TextLayoutManager {
public facebook::react::TextMeasurement measure(const facebook::react::AttributedStringBox& attributedStringBox, const facebook::react::ParagraphAttributes& paragraphAttributes, const facebook::react::TextLayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const;
public facebook::react::TextMeasurement measureCachedSpannableById(int64_t cacheId, const facebook::react::ParagraphAttributes& paragraphAttributes, const facebook::react::TextLayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const;
public facebook::react::TextMeasurement measurePreparedLayout(const facebook::react::TextLayoutManager::PreparedTextLayout& layout, const facebook::react::TextLayoutContext& layoutContext, const facebook::react::LayoutConstraints& layoutConstraints) const;
public using PreparedTextLayout = facebook::react::SafeReleaseJniRef<jni::global_ref<facebook::react::JPreparedLayout>>;
}

class facebook::react::TextLayoutManager::PreparedTextLayout {
public JPreparedLayout::javaobject get() const;
public PreparedTextLayout() = default;
public PreparedTextLayout(jni::global_ref<facebook::react::JPreparedLayout> ref);
public operator bool() const noexcept;
}

class facebook::react::TextMeasureCacheKey {
Expand Down
Loading