status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consolidate measure cache for layout nodes and leaf nodes 

Reviewed By: astreet

Differential Revision: D4957570

fbshipit-source-id: 5c5f39b67bd3f72d92b939ecee2d9a46c80b583f
This commit is contained in:
Emil Sjolander 2017-04-27 13:02:55 -07:00 committed by Facebook Github Bot
parent 39f9e7a6b1
commit 6272ef87bc
1 changed files with 35 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ReactCommon/yoga/yoga/Yoga.c
View File

@ -3116,26 +3116,18 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
layout->cachedLayout.computedHeight = -1; layout->cachedLayout.computedHeight = -1;
} }
YGCachedMeasurement *cachedResults = NULL;
// Determine whether the results are already cached. We maintain a separate // Determine whether the results are already cached. We maintain a separate
// cache for layouts and measurements. A layout operation modifies the // cache for layouts and measurements. A layout operation modifies the
// positions // positions and dimensions for nodes in the subtree. The algorithm assumes that each
// and dimensions for nodes in the subtree. The algorithm assumes that each // node gets layed out a maximum of one time per tree layout, but multiple
// node // measurements may be required to resolve all of the flex dimensions.
// gets layed out a maximum of one time per tree layout, but multiple
// measurements YGCachedMeasurement *cachedResults = NULL;
// may be required to resolve all of the flex dimensions.
// We handle nodes with measure functions specially here because they are the
// most
// expensive to measure, so it's worth avoiding redundant measurements if at
// all possible.
if (node->measure) {
const float marginAxisRow = YGNodeMarginForAxis(node, YGFlexDirectionRow, parentWidth); const float marginAxisRow = YGNodeMarginForAxis(node, YGFlexDirectionRow, parentWidth);
const float marginAxisColumn = YGNodeMarginForAxis(node, YGFlexDirectionColumn, parentWidth); const float marginAxisColumn = YGNodeMarginForAxis(node, YGFlexDirectionColumn, parentWidth);
// First, try to use the layout cache. // First, try to use the layout cache.
if (YGNodeCanUseCachedMeasurement(widthMeasureMode, if ((node->measure || performLayout) && YGNodeCanUseCachedMeasurement(widthMeasureMode,
availableWidth, availableWidth,
heightMeasureMode, heightMeasureMode,
availableHeight, availableHeight,
@ -3148,7 +3140,7 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
marginAxisRow, marginAxisRow,
marginAxisColumn)) { marginAxisColumn)) {
cachedResults = &layout->cachedLayout; cachedResults = &layout->cachedLayout;
} else { } else if (node->measure || !performLayout) {
// Try to use the measurement cache. // Try to use the measurement cache.
for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) { for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) {
if (YGNodeCanUseCachedMeasurement(widthMeasureMode, if (YGNodeCanUseCachedMeasurement(widthMeasureMode,
@ -3168,24 +3160,6 @@ bool YGLayoutNodeInternal(const YGNodeRef node,
} }
} }
} }
} else if (performLayout) {
if (YGFloatsEqual(layout->cachedLayout.availableWidth, availableWidth) &&
YGFloatsEqual(layout->cachedLayout.availableHeight, availableHeight) &&
layout->cachedLayout.widthMeasureMode == widthMeasureMode &&
layout->cachedLayout.heightMeasureMode == heightMeasureMode) {
cachedResults = &layout->cachedLayout;
}
} else {
for (uint32_t i = 0; i < layout->nextCachedMeasurementsIndex; i++) {
if (YGFloatsEqual(layout->cachedMeasurements[i].availableWidth, availableWidth) &&
YGFloatsEqual(layout->cachedMeasurements[i].availableHeight, availableHeight) &&
layout->cachedMeasurements[i].widthMeasureMode == widthMeasureMode &&
layout->cachedMeasurements[i].heightMeasureMode == heightMeasureMode) {
cachedResults = &layout->cachedMeasurements[i];
break;
}
}
}
if (!needToVisitNode && cachedResults != NULL) { if (!needToVisitNode && cachedResults != NULL) {
layout->measuredDimensions[YGDimensionWidth] = cachedResults->computedWidth; layout->measuredDimensions[YGDimensionWidth] = cachedResults->computedWidth;