Facebook/react-native
1
0 Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change State references to TextLayoutManager to a weak_ptr (ParagraphState)

Browse Source 
Summary:
TextLayoutManager indirectly holds ShadowNodes, which could hold onto TextLayoutManager via a shared_ptr; so we probably have some reference cycles here.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D27238439

fbshipit-source-id: b0b65cc451891e75bafddb7a08aa34ddf86d6a35
This commit is contained in:
Joshua Gross authored and Facebook GitHub Bot committed 2021-03-22 19:29:32 -07:00
1 parent 74682c54f9
commit aca0f418ba
3 files changed
+20 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+15 -13
View File
@@ -106,8 +106,8 @@ using namespace facebook::react;
return;
}
auto textLayoutManager = _state->getData().layoutManager;
assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
auto textLayoutManager = _state->getData().layoutManager.lock();
// assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
if (!textLayoutManager) {
return;
@@ -152,14 +152,18 @@ using namespace facebook::react;
auto &data = _state->getData();
if (![_accessibilityProvider isUpToDate:data.attributedString]) {
RCTTextLayoutManager *textLayoutManager =
(RCTTextLayoutManager *)unwrapManagedObject(data.layoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
_accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
layoutManager:textLayoutManager
paragraphAttributes:data.paragraphAttributes
frame:frame
view:self];
auto textLayoutManager = data.layoutManager.lock();
if (textLayoutManager) {
RCTTextLayoutManager *nativeTextLayoutManager =
(RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
_accessibilityProvider =
[[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
layoutManager:nativeTextLayoutManager
paragraphAttributes:data.paragraphAttributes
frame:frame
view:self];
}
}
return _accessibilityProvider.accessibilityElements;
@@ -178,9 +182,7 @@ using namespace facebook::react;
return _eventEmitter;
}
auto textLayoutManager = _state->getData().layoutManager;
assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
auto textLayoutManager = _state->getData().layoutManager.lock();
if (!textLayoutManager) {
return _eventEmitter;
ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+1 -7
View File
@@ -102,13 +102,7 @@ void ParagraphShadowNode::updateStateIfNeeded(Content const &content) {
auto &state = getStateData();
react_native_assert(textLayoutManager_);
react_native_assert(
(!state.layoutManager || state.layoutManager == textLayoutManager_) &&
"`StateData` refers to a different `TextLayoutManager`");
if (state.attributedString == content.attributedString &&
state.layoutManager == textLayoutManager_) {
if (state.attributedString == content.attributedString) {
return;
}
ReactCommon/react/renderer/components/text/ParagraphState.h
+4 -2
View File
@@ -40,14 +40,16 @@ class ParagraphState final {
* `TextLayoutManager` provides a connection to platform-specific
* text rendering infrastructure which is capable to render the
* `AttributedString`.
* This is not on every platform. This is not used on Android, but is
* used on the iOS mounting layer.
*/
SharedTextLayoutManager layoutManager;
std::weak_ptr<TextLayoutManager const> layoutManager;
#ifdef ANDROID
ParagraphState(
AttributedString const &attributedString,
ParagraphAttributes const &paragraphAttributes,
SharedTextLayoutManager const &layoutManager)
std::weak_ptr<const TextLayoutManager> const &layoutManager)
: attributedString(attributedString),
paragraphAttributes(paragraphAttributes),
layoutManager(layoutManager) {}