Node -> Measure func map instead of vec (#1581)
Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1581 This is better than just trusting the order of the measure func call. Now each measure function I/O is associated with a node in the JSON. Reviewed By: NickGerleman Differential Revision: D53776790 fbshipit-source-id: 793cf2d9cbf6f663d24848af0af30aa297614eea
This commit is contained in:
committed by
Facebook GitHub Bot
parent
b35456b93c
commit
c278713eb5
@@ -228,18 +228,14 @@ YGMeasureMode measureModeFromString(std::string str) {
|
||||
}
|
||||
}
|
||||
|
||||
void populateMeasureFuncVec(
|
||||
json& j,
|
||||
std::shared_ptr<MeasureFuncVecWithIndex> fns) {
|
||||
for (auto measureFuncJson : j) {
|
||||
fns->vec.push_back(SerializedMeasureFunc{
|
||||
floatFromJson(measureFuncJson["width"]),
|
||||
measureModeFromString(measureFuncJson["width-mode"]),
|
||||
floatFromJson(measureFuncJson["height"]),
|
||||
measureModeFromString(measureFuncJson["height-mode"]),
|
||||
floatFromJson(measureFuncJson["output-width"]),
|
||||
floatFromJson(measureFuncJson["output-height"]),
|
||||
measureFuncJson["duration-ns"]});
|
||||
}
|
||||
SerializedMeasureFunc serializedMeasureFuncFromJson(json& j) {
|
||||
return SerializedMeasureFunc{
|
||||
floatFromJson(j["width"]),
|
||||
measureModeFromString(j["width-mode"]),
|
||||
floatFromJson(j["height"]),
|
||||
measureModeFromString(j["height-mode"]),
|
||||
floatFromJson(j["output-width"]),
|
||||
floatFromJson(j["output-height"]),
|
||||
j["duration-ns"]};
|
||||
}
|
||||
} // namespace facebook::yoga
|
||||
|
Reference in New Issue
Block a user