diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp index 3a876dba9c5..f17a8e41bed 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp +++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.cpp @@ -104,14 +104,6 @@ bool YogaLayoutableShadowNode::getIsLayoutClean() const { return !yogaNode_.isDirty(); } -bool YogaLayoutableShadowNode::getHasNewLayout() const { - return yogaNode_.getHasNewLayout(); -} - -void YogaLayoutableShadowNode::setHasNewLayout(bool hasNewLayout) { - yogaNode_.setHasNewLayout(hasNewLayout); -} - #pragma mark - Mutating Methods void YogaLayoutableShadowNode::enableMeasurement() { @@ -342,11 +334,11 @@ void YogaLayoutableShadowNode::layoutTree( &yogaNode_, YGUndefined, YGUndefined, YGDirectionInherit); } - if (getHasNewLayout()) { + if (yogaNode_.getHasNewLayout()) { auto layoutMetrics = layoutMetricsFromYogaNode(yogaNode_); layoutMetrics.pointScaleFactor = layoutContext.pointScaleFactor; setLayoutMetrics(layoutMetrics); - setHasNewLayout(false); + yogaNode_.setHasNewLayout(false); } layout(layoutContext); diff --git a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h index 5372e8274ce..5566e10590f 100644 --- a/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h +++ b/ReactCommon/fabric/components/view/yoga/YogaLayoutableShadowNode.h @@ -73,9 +73,6 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { void dirtyLayout() override; bool getIsLayoutClean() const override; - void setHasNewLayout(bool hasNewLayout) override; - bool getHasNewLayout() const override; - /* * Computes layout using Yoga layout engine. * See `LayoutableShadowNode` for more details. diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp index b7f04583828..ba26ba40e32 100644 --- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp +++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp @@ -238,11 +238,6 @@ ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint( SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const { auto list = SharedDebugStringConvertibleList{}; - if (getHasNewLayout()) { - list.push_back( - std::make_shared("hasNewLayout")); - } - if (!getIsLayoutClean()) { list.push_back(std::make_shared("dirty")); } diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h index c4f45bf082e..1bcd163ead7 100644 --- a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h +++ b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h @@ -153,13 +153,6 @@ class LayoutableShadowNode : public ShadowNode { virtual void dirtyLayout() = 0; virtual bool getIsLayoutClean() const = 0; - /* - * Indicates does the shadow node (or any descendand node of the node) - * get a new layout metrics during a previous layout pass. - */ - virtual void setHasNewLayout(bool hasNewLayout) = 0; - virtual bool getHasNewLayout() const = 0; - /* * Unifed methods to access text layout metrics. */