corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset cd09151a1c46 (bug 1898214) for causing OS X wpt failures in transform-input-014.html.

Browse Source
This commit is contained in:
Stanca Serban
2024-06-05 18:46:28 +03:00
parent 16d82f536d
commit 1e7737760a
5 changed files with 4 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dom/html/HTMLInputElement.cpp
View File

@@ -6914,79 +6914,16 @@ bool HTMLInputElement::IsPasswordTextControl() const {
return mType == FormControlType::InputPassword;
}
Maybe<int32_t> HTMLInputElement::GetNumberInputCols() const {
// This logic is ported from WebKit, see
// https://github.com/whatwg/html/issues/10390
struct RenderSize {
uint32_t mBeforeDecimal = 0;
uint32_t mAfterDecimal = 0;
RenderSize Max(const RenderSize& aOther) const {
return {std::max(mBeforeDecimal, aOther.mBeforeDecimal),
std::max(mAfterDecimal, aOther.mAfterDecimal)};
}
static RenderSize From(const Decimal& aValue) {
MOZ_ASSERT(aValue.isFinite());
nsAutoCString tmp;
tmp.AppendInt(aValue.value().coefficient());
const uint32_t sizeOfDigits = tmp.Length();
const uint32_t sizeOfSign = aValue.isNegative() ? 1 : 0;
const int32_t exponent = aValue.exponent();
if (exponent >= 0) {
return {sizeOfSign + sizeOfDigits, 0};
}
const int32_t sizeBeforeDecimalPoint = exponent + int32_t(sizeOfDigits);
if (sizeBeforeDecimalPoint > 0) {
// In case of "123.456"
return {sizeOfSign + sizeBeforeDecimalPoint,
sizeOfDigits - sizeBeforeDecimalPoint};
}
// In case of "0.00012345"
const uint32_t sizeOfZero = 1;
const uint32_t numberOfZeroAfterDecimalPoint = -sizeBeforeDecimalPoint;
return {sizeOfSign + sizeOfZero,
numberOfZeroAfterDecimalPoint + sizeOfDigits};
}
};
if (mType != FormControlType::InputNumber) {
return {};
}
Decimal min = GetMinimum();
if (!min.isFinite()) {
return {};
}
Decimal max = GetMaximum();
if (!max.isFinite()) {
return {};
}
Decimal step = GetStep();
if (step == kStepAny) {
return {};
}
MOZ_ASSERT(step.isFinite());
RenderSize size = RenderSize::From(min).Max(
RenderSize::From(max).Max(RenderSize::From(step)));
return Some(size.mBeforeDecimal + size.mAfterDecimal +
(size.mAfterDecimal ? 1 : 0));
}
int32_t HTMLInputElement::GetCols() {
if (const nsAttrValue* attr = GetParsedAttr(nsGkAtoms::size);
attr && attr->Type() == nsAttrValue::eInteger) {
// Else we know (assume) it is an input with size attr
const nsAttrValue* attr = GetParsedAttr(nsGkAtoms::size);
if (attr && attr->Type() == nsAttrValue::eInteger) {
int32_t cols = attr->GetIntegerValue();
if (cols > 0) {
return cols;
}
}
if (Maybe<int32_t> cols = GetNumberInputCols(); cols && *cols > 0) {
return *cols;
}
return DEFAULT_COLS;
}