Skip to content

Commit

Permalink
Simplify collectResults(1/x)
Browse files Browse the repository at this point in the history 
Summary: Pulling up the computation of bounds to remove the dependency of `LithoLayoutResult` for `createRenderTreeNode`. And also we don't need to always calculate the bounds in each call.

Reviewed By: adityasharat

Differential Revision: D51347381

fbshipit-source-id: 70ec59e8f0b0914818741b805d82428748f1f641
  • Loading branch information
@facebook-github-bot
Andrew Wang authored and facebook-github-bot committed Nov 16, 2023
1 parent ddde25a commit 23e35c6
Showing 1 changed file with 39 additions and 56 deletions.
95 changes: 39 additions & 56 deletions litho-core/src/main/java/com/facebook/litho/LithoReducer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ object LithoReducer {
private fun createContentRenderTreeNode(
result: LayoutResult,
node: LithoNode,
bounds: Rect,
layoutState: LayoutState,
parent: RenderTreeNode? = null,
debugHierarchyNode: DebugHierarchy.Node? = null,
Expand All @@ -218,6 +219,7 @@ object LithoReducer {
val debugNode: DebugHierarchy.Node? = debugHierarchyNode?.mutateType(OutputUnitType.CONTENT)
return createRenderTreeNode(
unit = unit,
bounds = bounds,
layoutState = layoutState,
result = result,
useNodePadding = true,
Expand All @@ -235,13 +237,15 @@ object LithoReducer {

private fun createHostRenderTreeNode(
unit: LithoRenderUnit,
bounds: Rect,
layoutState: LayoutState,
result: LayoutResult,
parent: RenderTreeNode? = null,
hierarchy: DebugHierarchy.Node? = null,
): RenderTreeNode =
createRenderTreeNode(
unit = unit,
bounds = bounds,
layoutState = layoutState,
result = result as LithoLayoutResult,
useNodePadding = false,
Expand All @@ -252,6 +256,7 @@ object LithoReducer {

private fun createRenderTreeNode(
unit: LithoRenderUnit,
bounds: Rect,
layoutState: LayoutState,
result: LithoLayoutResult,
useNodePadding: Boolean,
Expand All @@ -262,20 +267,13 @@ object LithoReducer {
debugHierarchyNode: DebugHierarchy.Node? = null,
): RenderTreeNode {

val hostTranslationX: Int
val hostTranslationY: Int
if (parent != null) {
hostTranslationX = parent.absoluteX
hostTranslationY = parent.absoluteY
} else {
hostTranslationX = 0
hostTranslationY = 0
}
val hostTranslationX: Int = parent?.absoluteX ?: 0
val hostTranslationY: Int = parent?.absoluteY ?: 0

var l: Int = layoutState.mCurrentX - hostTranslationX + result.x
var t: Int = layoutState.mCurrentY - hostTranslationY + result.y
var r: Int = l + result.width
var b: Int = t + result.height
var l: Int = bounds.left - hostTranslationX
var t: Int = bounds.top - hostTranslationY
var r: Int = l + bounds.width()
var b: Int = t + bounds.height()

if (useNodePadding) {
if (Component.isPrimitive(unit.component)) {
Expand All @@ -302,15 +300,15 @@ object LithoReducer {
}
}

val bounds = Rect(l, t, r, b)
val resolvedBounds = Rect(l, t, r, b)

return create(
unit = unit,
bounds = bounds,
bounds = resolvedBounds,
layoutData =
LithoLayoutData(
width = bounds.width(),
height = bounds.height(),
width = resolvedBounds.width(),
height = resolvedBounds.height(),
currentLayoutStateId = layoutState.mId,
previousLayoutStateId = layoutState.mPreviousLayoutStateId,
expandedTouchBounds = result.expandedTouchBounds,
Expand All @@ -325,19 +323,11 @@ object LithoReducer {
* stored in the [LithoNode].
*/
private fun createVisibilityOutput(
result: LayoutResult,
node: LithoNode,
layoutState: LayoutState,
x: Int,
y: Int,
bounds: Rect,
renderTreeNode: RenderTreeNode?
): VisibilityOutput {

val l: Int = layoutState.mCurrentX + x
val t: Int = layoutState.mCurrentY + y
val r: Int = l + result.width
val b: Int = t + result.height

val visibleHandler: EventHandler<VisibleEvent>? = node.visibleHandler
val focusedHandler: EventHandler<FocusedVisibleEvent>? = node.focusedHandler
val unfocusedHandler: EventHandler<UnfocusedVisibleEvent>? = node.unfocusedHandler
Expand All @@ -352,7 +342,7 @@ object LithoReducer {
return VisibilityOutput(
componentGlobalKey,
component.simpleName,
Rect(l, t, r, b),
Rect(bounds),
renderTreeNode != null,
renderTreeNode?.renderUnit?.id ?: 0,
node.visibleHeightRatio,
Expand All @@ -367,22 +357,13 @@ object LithoReducer {
}

private fun createTestOutput(
result: LayoutResult,
node: LithoNode,
layoutState: LayoutState,
x: Int,
y: Int,
bounds: Rect,
renderUnit: LithoRenderUnit? = null
): TestOutput {

val l: Int = layoutState.mCurrentX + x
val t: Int = layoutState.mCurrentY + y
val r: Int = l + result.width
val b: Int = t + result.height

val output = TestOutput()
output.testKey = checkNotNull(node.testKey)
output.setBounds(l, t, r, b)
output.setBounds(bounds.left, bounds.top, bounds.right, bounds.bottom)
if (renderUnit != null) {
output.layoutOutputId = renderUnit.id
}
Expand Down Expand Up @@ -502,11 +483,19 @@ object LithoReducer {
layoutState.mCurrentLayoutOutputAffinityGroup =
if (layoutState.mCurrentTransitionId != null) OutputUnitsAffinityGroup() else null

// create bounds
val l: Int = layoutState.mCurrentX + x
val t: Int = layoutState.mCurrentY + y
val r: Int = l + result.width
val b: Int = t + result.height
val bounds = Rect(l, t, r, b)

// 1. Insert a host LayoutOutput if we have some interactive content to be attached to.
if (hostRenderUnit != null) {
val hostLayoutPosition =
addHostRenderTreeNode(
hostRenderUnit = hostRenderUnit,
bounds = bounds,
parent = parentRenderTreeNode,
result = result,
node = node,
Expand All @@ -524,6 +513,7 @@ object LithoReducer {
val backgroundRenderTreeNode =
addDrawableRenderTreeNode(
unit = backgroundRenderUnit,
bounds = bounds,
parent = parentRenderTreeNode,
result = result,
layoutState = layoutState,
Expand All @@ -540,6 +530,7 @@ object LithoReducer {
createContentRenderTreeNode(
result = result,
node = node,
bounds = bounds,
layoutState = layoutState,
parent = parentRenderTreeNode,
debugHierarchyNode = hierarchy)
Expand Down Expand Up @@ -597,6 +588,7 @@ object LithoReducer {
val borderRenderTreeNode: RenderTreeNode =
addDrawableRenderTreeNode(
unit = borderRenderUnit,
bounds = bounds,
parent = parentRenderTreeNode,
result = result,
layoutState = layoutState,
Expand All @@ -613,6 +605,7 @@ object LithoReducer {
val foregroundRenderTreeNode: RenderTreeNode =
addDrawableRenderTreeNode(
unit = foregroundRenderUnit,
bounds = bounds,
parent = parentRenderTreeNode,
result = result,
layoutState = layoutState,
Expand All @@ -628,11 +621,8 @@ object LithoReducer {
if (node.hasVisibilityHandlers()) {
val visibilityOutput: VisibilityOutput =
createVisibilityOutput(
result = result,
node = node,
x = x,
y = y,
layoutState = layoutState,
bounds = bounds,
renderTreeNode =
contentRenderTreeNode ?: if (needsHostView) parentRenderTreeNode else null)

Expand All @@ -645,25 +635,14 @@ object LithoReducer {
if (layoutState.mTestOutputs != null && !node.testKey.isNullOrEmpty()) {
val testOutput: TestOutput =
createTestOutput(
result = result,
node = node,
x = x,
y = y,
layoutState = layoutState,
bounds = bounds,
renderUnit = contentRenderTreeNode?.renderUnit as? LithoRenderUnit)
layoutState.mTestOutputs.add(testOutput)
}

val rect: Rect
if (contentRenderTreeNode != null) {
rect = contentRenderTreeNode.getAbsoluteBounds(Rect())
} else {
rect = Rect()
rect.left = layoutState.mCurrentX + x
rect.top = layoutState.mCurrentY + y
rect.right = rect.left + result.width
rect.bottom = rect.top + result.height
}
// collect the adjusted bounds of the content render node if it exists
val rect: Rect = contentRenderTreeNode?.getAbsoluteBounds(Rect()) ?: bounds

for (i in 0 until node.componentCount) {
val delegate: Component = node.getComponentAt(i)
Expand Down Expand Up @@ -697,6 +676,7 @@ object LithoReducer {

private fun addDrawableRenderTreeNode(
unit: LithoRenderUnit,
bounds: Rect,
parent: RenderTreeNode? = null,
result: LayoutResult,
layoutState: LayoutState,
Expand All @@ -709,6 +689,7 @@ object LithoReducer {
val renderTreeNode: RenderTreeNode =
createRenderTreeNode(
unit = unit,
bounds = bounds,
layoutState = layoutState,
result = result as LithoLayoutResult,
useNodePadding = false,
Expand Down Expand Up @@ -787,6 +768,7 @@ object LithoReducer {
*/
private fun addHostRenderTreeNode(
hostRenderUnit: LithoRenderUnit,
bounds: Rect,
parent: RenderTreeNode? = null,
result: LithoLayoutResult,
node: LithoNode,
Expand All @@ -803,6 +785,7 @@ object LithoReducer {
val hostRenderTreeNode: RenderTreeNode =
createHostRenderTreeNode(
unit = hostRenderUnit,
bounds = bounds,
layoutState = layoutState,
result = result,
parent = parent,
Expand Down

0 comments on commit 23e35c6

Please sign in to comment.