Merge fx-team to m-c. a=merge

This commit is contained in:
Ryan VanderMeulen 2016-03-06 15:03:19 -05:00
commit 29fac38293

View File

@ -4357,8 +4357,8 @@ HTMLInputElement::HandleTypeChange(uint8_t aNewType)
// previous type does, we should clear out mFocusedValue.
if (MayFireChangeOnBlur(mType) && !MayFireChangeOnBlur(oldType)) {
GetValue(mFocusedValue);
} else if (!IsSingleLineTextControl(mType, false) &&
IsSingleLineTextControl(oldType, false)) {
} else if (!IsSingleLineTextControl(false, mType) &&
IsSingleLineTextControl(false, oldType)) {
mFocusedValue.Truncate();
}