microsoft
/
react-native-macos
зеркало из https://github.com/microsoft/react-native-macos.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Eliminate unnecessary copies of node style objects 

Summary:
@public

`YGNode.getStyle()` returns a reference to the enclosed `YGStyle` member. Assigning to a local copies unnecessarily.

Having eliminated the copy, we can also safely remove calls to `YGNode.setStyle()`, eliminating another copy.

Reviewed By: astreet

Differential Revision: D9083336

fbshipit-source-id: df8b603b5cc0b974cf5dd434c71956be4548e583
This commit is contained in:
David Aurelio 2018-08-15 06:13:28 -07:00 коммит произвёл Facebook Github Bot
Родитель f945212447
Коммит acd8820154
1 изменённых файлов: 22 добавлений и 59 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

81
ReactCommon/yoga/yoga/Yoga.cpp
Просмотреть файл

@ -598,9 +598,7 @@ struct StyleProp {
} }
static void set(YGNodeRef node, T newValue) { static void set(YGNodeRef node, T newValue) {
if (node->getStyle().*P != newValue) { if (node->getStyle().*P != newValue) {
YGStyle style = node->getStyle(); node->getStyle().*P = newValue;
style.*P = newValue;
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -618,9 +616,7 @@ struct StyleProp {
if ((node->getStyle().instanceName.value != value.value && \ if ((node->getStyle().instanceName.value != value.value && \
value.unit != YGUnitUndefined) || \ value.unit != YGUnitUndefined) || \
node->getStyle().instanceName.unit != value.unit) { \ node->getStyle().instanceName.unit != value.unit) { \
YGStyle style = node->getStyle(); \ node->getStyle().instanceName = value; \
style.instanceName = value; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} \ } \
@ -634,10 +630,7 @@ struct StyleProp {
if ((node->getStyle().instanceName.value != value.value && \ if ((node->getStyle().instanceName.value != value.value && \
value.unit != YGUnitUndefined) || \ value.unit != YGUnitUndefined) || \
node->getStyle().instanceName.unit != value.unit) { \ node->getStyle().instanceName.unit != value.unit) { \
YGStyle style = node->getStyle(); \ node->getStyle().instanceName = value; \
\
style.instanceName = value; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} }
@ -652,9 +645,7 @@ struct StyleProp {
if ((node->getStyle().instanceName.value != value.value && \ if ((node->getStyle().instanceName.value != value.value && \
value.unit != YGUnitUndefined) || \ value.unit != YGUnitUndefined) || \
node->getStyle().instanceName.unit != value.unit) { \ node->getStyle().instanceName.unit != value.unit) { \
YGStyle style = node->getStyle(); \ node->getStyle().instanceName = value; \
style.instanceName = value; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} \ } \
@ -663,21 +654,19 @@ struct StyleProp {
const YGNodeRef node, const type paramName) { \ const YGNodeRef node, const type paramName) { \
if (node->getStyle().instanceName.value != YGFloatSanitize(paramName) || \ if (node->getStyle().instanceName.value != YGFloatSanitize(paramName) || \
node->getStyle().instanceName.unit != YGUnitPercent) { \ node->getStyle().instanceName.unit != YGUnitPercent) { \
YGStyle style = node->getStyle(); \ YGStyle& style = node->getStyle(); \
style.instanceName.value = YGFloatSanitize(paramName); \ style.instanceName.value = YGFloatSanitize(paramName); \
style.instanceName.unit = \ style.instanceName.unit = \
YGFloatIsUndefined(paramName) ? YGUnitAuto : YGUnitPercent; \ YGFloatIsUndefined(paramName) ? YGUnitAuto : YGUnitPercent; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} \ } \
\ \
void YGNodeStyleSet##name##Auto(const YGNodeRef node) { \ void YGNodeStyleSet##name##Auto(const YGNodeRef node) { \
if (node->getStyle().instanceName.unit != YGUnitAuto) { \ if (node->getStyle().instanceName.unit != YGUnitAuto) { \
YGStyle style = node->getStyle(); \ YGStyle& style = node->getStyle(); \
style.instanceName.value = 0; \ style.instanceName.value = 0; \
style.instanceName.unit = YGUnitAuto; \ style.instanceName.unit = YGUnitAuto; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} }
@ -710,10 +699,9 @@ struct StyleProp {
#define YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO_IMPL(type, name, instanceName) \ #define YG_NODE_STYLE_EDGE_PROPERTY_UNIT_AUTO_IMPL(type, name, instanceName) \
void YGNodeStyleSet##name##Auto(const YGNodeRef node, const YGEdge edge) { \ void YGNodeStyleSet##name##Auto(const YGNodeRef node, const YGEdge edge) { \
if (node->getStyle().instanceName[edge].unit != YGUnitAuto) { \ if (node->getStyle().instanceName[edge].unit != YGUnitAuto) { \
YGStyle style = node->getStyle(); \ YGStyle& style = node->getStyle(); \
style.instanceName[edge].value = 0; \ style.instanceName[edge].value = 0; \
style.instanceName[edge].unit = YGUnitAuto; \ style.instanceName[edge].unit = YGUnitAuto; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} }
@ -729,9 +717,7 @@ struct StyleProp {
if ((node->getStyle().instanceName[edge].value != value.value && \ if ((node->getStyle().instanceName[edge].value != value.value && \
value.unit != YGUnitUndefined) || \ value.unit != YGUnitUndefined) || \
node->getStyle().instanceName[edge].unit != value.unit) { \ node->getStyle().instanceName[edge].unit != value.unit) { \
YGStyle style = node->getStyle(); \ node->getStyle().instanceName[edge] = value; \
style.instanceName[edge] = value; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} \ } \
@ -745,9 +731,7 @@ struct StyleProp {
if ((node->getStyle().instanceName[edge].value != value.value && \ if ((node->getStyle().instanceName[edge].value != value.value && \
value.unit != YGUnitUndefined) || \ value.unit != YGUnitUndefined) || \
node->getStyle().instanceName[edge].unit != value.unit) { \ node->getStyle().instanceName[edge].unit != value.unit) { \
YGStyle style = node->getStyle(); \ node->getStyle().instanceName[edge] = value; \
style.instanceName[edge] = value; \
node->setStyle(style); \
node->markDirtyAndPropogate(); \ node->markDirtyAndPropogate(); \
} \ } \
} \ } \
@ -875,13 +859,8 @@ YGDisplay YGNodeStyleGetDisplay(const YGNodeRef node) {
// TODO(T26792433): Change the API to accept YGFloatOptional. // TODO(T26792433): Change the API to accept YGFloatOptional.
void YGNodeStyleSetFlex(const YGNodeRef node, const float flex) { void YGNodeStyleSetFlex(const YGNodeRef node, const float flex) {
if (node->getStyle().flex != flex) { if (node->getStyle().flex != flex) {
YGStyle style = node->getStyle(); node->getStyle().flex =
if (YGFloatIsUndefined(flex)) { YGFloatIsUndefined(flex) ? YGFloatOptional() : YGFloatOptional(flex);
style.flex = YGFloatOptional();
} else {
style.flex = YGFloatOptional(flex);
}
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -895,13 +874,9 @@ float YGNodeStyleGetFlex(const YGNodeRef node) {
// TODO(T26792433): Change the API to accept YGFloatOptional. // TODO(T26792433): Change the API to accept YGFloatOptional.
void YGNodeStyleSetFlexGrow(const YGNodeRef node, const float flexGrow) { void YGNodeStyleSetFlexGrow(const YGNodeRef node, const float flexGrow) {
if (node->getStyle().flexGrow != flexGrow) { if (node->getStyle().flexGrow != flexGrow) {
YGStyle style = node->getStyle(); node->getStyle().flexGrow = YGFloatIsUndefined(flexGrow)
if (YGFloatIsUndefined(flexGrow)) { ? YGFloatOptional()
style.flexGrow = YGFloatOptional(); : YGFloatOptional(flexGrow);
} else {
style.flexGrow = YGFloatOptional(flexGrow);
}
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -909,13 +884,9 @@ void YGNodeStyleSetFlexGrow(const YGNodeRef node, const float flexGrow) {
// TODO(T26792433): Change the API to accept YGFloatOptional. // TODO(T26792433): Change the API to accept YGFloatOptional.
void YGNodeStyleSetFlexShrink(const YGNodeRef node, const float flexShrink) { void YGNodeStyleSetFlexShrink(const YGNodeRef node, const float flexShrink) {
if (node->getStyle().flexShrink != flexShrink) { if (node->getStyle().flexShrink != flexShrink) {
YGStyle style = node->getStyle(); node->getStyle().flexShrink = YGFloatIsUndefined(flexShrink)
if (YGFloatIsUndefined(flexShrink)) { ? YGFloatOptional()
style.flexShrink = YGFloatOptional(); : YGFloatOptional(flexShrink);
} else {
style.flexShrink = YGFloatOptional(flexShrink);
}
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -937,9 +908,7 @@ void YGNodeStyleSetFlexBasis(const YGNodeRef node, const float flexBasis) {
if ((node->getStyle().flexBasis.value != value.value && if ((node->getStyle().flexBasis.value != value.value &&
value.unit != YGUnitUndefined) || value.unit != YGUnitUndefined) ||
node->getStyle().flexBasis.unit != value.unit) { node->getStyle().flexBasis.unit != value.unit) {
YGStyle style = node->getStyle(); node->getStyle().flexBasis = value;
style.flexBasis = value;
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -949,21 +918,19 @@ void YGNodeStyleSetFlexBasisPercent(
const float flexBasisPercent) { const float flexBasisPercent) {
if (node->getStyle().flexBasis.value != flexBasisPercent || if (node->getStyle().flexBasis.value != flexBasisPercent ||
node->getStyle().flexBasis.unit != YGUnitPercent) { node->getStyle().flexBasis.unit != YGUnitPercent) {
YGStyle style = node->getStyle(); YGStyle& style = node->getStyle();
style.flexBasis.value = YGFloatSanitize(flexBasisPercent); style.flexBasis.value = YGFloatSanitize(flexBasisPercent);
style.flexBasis.unit = style.flexBasis.unit =
YGFloatIsUndefined(flexBasisPercent) ? YGUnitAuto : YGUnitPercent; YGFloatIsUndefined(flexBasisPercent) ? YGUnitAuto : YGUnitPercent;
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
void YGNodeStyleSetFlexBasisAuto(const YGNodeRef node) { void YGNodeStyleSetFlexBasisAuto(const YGNodeRef node) {
if (node->getStyle().flexBasis.unit != YGUnitAuto) { if (node->getStyle().flexBasis.unit != YGUnitAuto) {
YGStyle style = node->getStyle(); YGStyle& style = node->getStyle();
style.flexBasis.value = 0; style.flexBasis.value = 0;
style.flexBasis.unit = YGUnitAuto; style.flexBasis.unit = YGUnitAuto;
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -985,9 +952,7 @@ void YGNodeStyleSetBorder(
if ((node->getStyle().border[edge].value != value.value && if ((node->getStyle().border[edge].value != value.value &&
value.unit != YGUnitUndefined) || value.unit != YGUnitUndefined) ||
node->getStyle().border[edge].unit != value.unit) { node->getStyle().border[edge].unit != value.unit) {
YGStyle style = node->getStyle(); node->getStyle().border[edge] = value;
style.border[edge] = value;
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }
@ -1014,9 +979,7 @@ float YGNodeStyleGetAspectRatio(const YGNodeRef node) {
// TODO(T26792433): Change the API to accept YGFloatOptional. // TODO(T26792433): Change the API to accept YGFloatOptional.
void YGNodeStyleSetAspectRatio(const YGNodeRef node, const float aspectRatio) { void YGNodeStyleSetAspectRatio(const YGNodeRef node, const float aspectRatio) {
if (node->getStyle().aspectRatio != aspectRatio) { if (node->getStyle().aspectRatio != aspectRatio) {
YGStyle style = node->getStyle(); node->getStyle().aspectRatio = YGFloatOptional(aspectRatio);
style.aspectRatio = YGFloatOptional(aspectRatio);
node->setStyle(style);
node->markDirtyAndPropogate(); node->markDirtyAndPropogate();
} }
} }