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

Fabric: Using (un)wrapManagedObject in TextLayoutManager

Browse Source 
Summary:
Investigating a crash, I spend half of an hour staring at `__bridge`, `__bridge_retained`, `CFRelease` and etc trying to understand is there a bug or not. Even if I think there was no bug there, it should not be this way. We have a nice abstraction around that madness we should use to make the code obvious.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D20260917

fbshipit-source-id: 2b511ebf46a78950c4720e749099134aed1dd890
This commit is contained in:
Valentin Shergin
2020-03-08 21:31:54 -07:00
committed by Facebook Github Bot
parent 460c698e5f
commit a426c8dc77
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+4 -2
View File
@@ -15,6 +15,8 @@
#import <react/graphics/Geometry.h>
#import <react/textlayoutmanager/RCTTextLayoutManager.h>
#import <react/textlayoutmanager/TextLayoutManager.h>
#import <react/utils/ManagedObjectWrapper.h>
#import "RCTConversions.h"
using namespace facebook::react;
@@ -88,7 +90,7 @@ using namespace facebook::react;
}
RCTTextLayoutManager *nativeTextLayoutManager =
(__bridge RCTTextLayoutManager *)textLayoutManager->getNativeTextLayoutManager();
(RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
@@ -128,7 +130,7 @@ using namespace facebook::react;
}
RCTTextLayoutManager *nativeTextLayoutManager =
(__bridge RCTTextLayoutManager *)textLayoutManager->getNativeTextLayoutManager();
(RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:_state->getData().attributedString
ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
+2 -3
View File
@@ -30,7 +30,6 @@ class TextLayoutManager {
using Shared = std::shared_ptr<TextLayoutManager const>;
TextLayoutManager(ContextContainer::Shared const &contextContainer);
~TextLayoutManager();
/*
* Measures `attributedString` using native text rendering infrastructure.
@@ -44,10 +43,10 @@ class TextLayoutManager {
* Returns an opaque pointer to platform-specific TextLayoutManager.
* Is used on a native views layer to delegate text rendering to the manager.
*/
void *getNativeTextLayoutManager() const;
std::shared_ptr<void> getNativeTextLayoutManager() const;
private:
void *self_;
std::shared_ptr<void> self_;
TextMeasureCache measureCache_{};
};
ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
+3 -9
View File
@@ -16,16 +16,10 @@ namespace react {
TextLayoutManager::TextLayoutManager(ContextContainer::Shared const &contextContainer)
{
self_ = (__bridge_retained void *)[RCTTextLayoutManager new];
self_ = wrapManagedObject([RCTTextLayoutManager new]);
}
TextLayoutManager::~TextLayoutManager()
{
CFRelease(self_);
self_ = nullptr;
}
void *TextLayoutManager::getNativeTextLayoutManager() const
std::shared_ptr<void> TextLayoutManager::getNativeTextLayoutManager() const
{
assert(self_ && "Stored NativeTextLayoutManager must not be null.");
return self_;
@@ -36,7 +30,7 @@ Size TextLayoutManager::measure(
ParagraphAttributes paragraphAttributes,
LayoutConstraints layoutConstraints) const
{
RCTTextLayoutManager *textLayoutManager = (__bridge RCTTextLayoutManager *)self_;
RCTTextLayoutManager *textLayoutManager = (RCTTextLayoutManager *)unwrapManagedObject(self_);
auto size = Size{};