Back out Stack D13119110..D13236159

Summary: backout, causes failures

Reviewed By: adityasharat

Differential Revision: D13376210

fbshipit-source-id: 1fa8823f2dce601c47738f34ddb2674288197e79
This commit is contained in:
David Aurelio
2018-12-07 12:37:12 -08:00
committed by Facebook Github Bot
parent 6b7f6980f9
commit b26e637c81
19 changed files with 612 additions and 701 deletions

View File

@@ -14,9 +14,9 @@ namespace facebook {
namespace yoga {
typedef std::string string;
static void indent(string& base, uint32_t level) {
static void indent(string* base, uint32_t level) {
for (uint32_t i = 0; i < level; ++i) {
base.append(" ");
base->append(" ");
}
}
@@ -25,7 +25,7 @@ static bool areFourValuesEqual(const std::array<YGValue, YGEdgeCount>& four) {
YGValueEqual(four[0], four[3]);
}
static void appendFormatedString(string& str, const char* fmt, ...) {
static void appendFormatedString(string* str, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
va_list argsCopy;
@@ -35,25 +35,25 @@ static void appendFormatedString(string& str, const char* fmt, ...) {
vsnprintf(buf.data(), buf.size(), fmt, argsCopy);
va_end(argsCopy);
string result = string(buf.begin(), buf.end() - 1);
str.append(result);
str->append(result);
}
static void appendFloatOptionalIfDefined(
string& base,
string* base,
const string key,
const YGFloatOptional num) {
if (!num.isUndefined()) {
appendFormatedString(base, "%s: %g; ", key.c_str(), num.unwrap());
appendFormatedString(base, "%s: %g; ", key.c_str(), num.getValue());
}
}
static void appendNumberIfNotUndefined(
string& base,
string* base,
const string key,
const YGValue number) {
if (number.unit != YGUnitUndefined) {
if (number.unit == YGUnitAuto) {
base.append(key + ": auto; ");
base->append(key + ": auto; ");
} else {
string unit = number.unit == YGUnitPoint ? "px" : "%%";
appendFormatedString(
@@ -63,23 +63,24 @@ static void appendNumberIfNotUndefined(
}
static void
appendNumberIfNotAuto(string& base, const string& key, const YGValue number) {
appendNumberIfNotAuto(string* base, const string& key, const YGValue number) {
if (number.unit != YGUnitAuto) {
appendNumberIfNotUndefined(base, key, number);
}
}
static void
appendNumberIfNotZero(string& base, const string& str, const YGValue number) {
appendNumberIfNotZero(string* base, const string& str, const YGValue number) {
if (number.unit == YGUnitAuto) {
base.append(str + ": auto; ");
base->append(str + ": auto; ");
} else if (!YGFloatsEqual(number.value, 0)) {
appendNumberIfNotUndefined(base, str, number);
}
}
static void appendEdges(
string& base,
string* base,
const string& key,
const std::array<YGValue, YGEdgeCount>& edges) {
if (areFourValuesEqual(edges)) {
@@ -93,7 +94,7 @@ static void appendEdges(
}
static void appendEdgeIfNotUndefined(
string& base,
string* base,
const string& str,
const std::array<YGValue, YGEdgeCount>& edges,
const YGEdge edge) {
@@ -102,7 +103,7 @@ static void appendEdgeIfNotUndefined(
}
void YGNodeToString(
std::string& str,
std::string* str,
YGNodeRef node,
YGPrintOptions options,
uint32_t level) {