perf(ios): check whether the dirtyText behavior requires layout

Tencent · Aug 28, 2023 · 114d0d7 · 114d0d7
1 parent 36aaa91
commit 114d0d7
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 20 deletions.
diff --git a/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm b/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
@@ -184,7 +184,7 @@ - (BOOL)isCSSLeafNode {
 }
 
 - (void)contentSizeMultiplierDidChange:(__unused NSNotification *)note {
-    [self dirtyText];
+    [self dirtyText:YES];
 }
 
 - (NSDictionary<NSString *, id> *)processUpdatedProperties:(NSMutableSet<NativeRenderApplierBlock> *)applierBlocks
@@ -310,7 +310,7 @@ - (void)applyConfirmedLayoutDirectionToSubviews:(hippy::Direction)confirmedLayou
         return;
     }
     [super applyConfirmedLayoutDirectionToSubviews:confirmedLayoutDirection];
-    [self dirtyText];
+    [self dirtyText:YES];
 }
 
 - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width widthMode:(hippy::LayoutMeasureMode)widthMode {
@@ -366,28 +366,43 @@ - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width widthMode:(hippy::Lay
     return textStorage;
 }
 
-- (void)dirtyText {
-    [super dirtyText];
+- (void)dirtyText:(BOOL)needToDoLayout {
+    [super dirtyText:needToDoLayout];
     _isTextDirty = YES;
     _cachedTextStorage = nil;
     auto domManager = self.domManager.lock();
+    auto weakDomManager = self.domManager;
     if (domManager) {
         __weak NativeRenderObjectView *weakSelf = self;
-        std::vector<std::function<void()>> ops_ = {[weakSelf, domManager](){
+        auto domNodeAction = [needToDoLayout, weakSelf, weakDomManager](){
             @autoreleasepool {
                 NativeRenderObjectView *strongSelf = weakSelf;
-                if (strongSelf) {
-                    int32_t componentTag = [[strongSelf componentTag] intValue];
-                    auto domNode = domManager->GetNode(strongSelf.rootNode, componentTag);
-                    if (domNode) {
-                        domNode->GetLayoutNode()->MarkDirty();
-                        domManager->DoLayout(strongSelf.rootNode);
-                        domManager->EndBatch(strongSelf.rootNode);
+                if (!strongSelf) {
+                    return;
+                }
+                auto strongDomManager = weakDomManager.lock();
+                if (!strongDomManager) {
+                    return;
+                }
+                int32_t componentTag = [[strongSelf componentTag] intValue];
+                auto domNode = strongDomManager->GetNode(strongSelf.rootNode, componentTag);
+                if (domNode) {
+                    domNode->GetLayoutNode()->MarkDirty();
+                    if (needToDoLayout) {
+                        strongDomManager->DoLayout(strongSelf.rootNode);
+                        strongDomManager->EndBatch(strongSelf.rootNode);
                     }
                 }
             }
-        }};
-        domManager->PostTask(hippy::dom::Scene(std::move(ops_)));
+        };
+        BOOL isJSTaskRunner = (domManager->GetTaskRunner() && footstone::TaskRunner::GetCurrentTaskRunner());
+        if (isJSTaskRunner) {
+            domNodeAction();
+        }
+        else {
+            std::vector<std::function<void()>> ops = {domNodeAction};
+            domManager->PostTask(hippy::dom::Scene(std::move(ops)));
+        }
     }
 }
 
@@ -707,7 +722,7 @@ - (void)didSetProps:(NSArray<NSString *> *)changedProps {
         _textAlignSet = YES;
     }
     if (_needDirtyText) {
-        [self dirtyText];
+        [self dirtyText:NO];
         _needDirtyText =NO;
     }
 }
@@ -952,7 +967,7 @@ - (void)setFontSizeMultiplier:(CGFloat)fontSizeMultiplier {
             ((NativeRenderObjectText *)child).fontSizeMultiplier = fontSizeMultiplier;
         }
     }
-    [self dirtyText];
+    [self dirtyText:NO];
 }
 
 - (void)setMinimumFontScale:(CGFloat)minimumFontScale {

diff --git a/renderer/native/ios/renderer/component/view/NativeRenderObjectView.h b/renderer/native/ios/renderer/component/view/NativeRenderObjectView.h
@@ -203,7 +203,7 @@ extern NSString *const NativeRenderShadowViewDiffTag;
 - (void)dirtyPropagation:(NativeRenderUpdateLifecycle)type NS_REQUIRES_SUPER;
 - (BOOL)isPropagationDirty:(NativeRenderUpdateLifecycle)dirtyType;
 
-- (void)dirtyText NS_REQUIRES_SUPER;
+- (void)dirtyText:(BOOL)needToDoLayout NS_REQUIRES_SUPER;
 - (void)setTextComputed NS_REQUIRES_SUPER;
 - (BOOL)isTextDirty;
 

diff --git a/renderer/native/ios/renderer/component/view/NativeRenderObjectView.mm b/renderer/native/ios/renderer/component/view/NativeRenderObjectView.mm
@@ -154,7 +154,7 @@ - (BOOL)isPropagationDirty:(NativeRenderUpdateLifecycle)dirtyType {
     return isDirty;
 }
 
-- (void)dirtyText {
+- (void)dirtyText:(BOOL)needToDoLayout {
 }
 
 - (BOOL)isTextDirty {
@@ -225,7 +225,7 @@ - (void)insertNativeRenderSubview:(NativeRenderObjectView *)subview atIndex:(NSI
     }
     subview->_superview = self;
     _didUpdateSubviews = YES;
-    [self dirtyText];
+    [self dirtyText:NO];
     [self dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
 }
 
@@ -237,7 +237,7 @@ - (void)moveNativeRenderSubview:(id<NativeRenderComponentProtocol>)subview toInd
 }
 
 - (void)removeNativeRenderSubview:(NativeRenderObjectView *)subview {
-    [subview dirtyText];
+    [subview dirtyText:NO];
     [subview dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
     _didUpdateSubviews = YES;
     subview->_superview = nil;