Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1270310) for mass mochitest bustage CLOSED TREE

Browse Source 
Backed out changeset ff9ace379d78 (bug 1270310)
Backed out changeset 605790e5e611 (bug 1270310)
Backed out changeset 4c302e1119e1 (bug 1270310)
Backed out changeset 3e2d76bd1f08 (bug 1270310)
This commit is contained in:
Wes Kocher 2016-05-26 00:04:04 -07:00
parent b18470d23d
commit 8249ffcbd2
5 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dom/html/HTMLInputElement.cpp
View File

@ -1527,10 +1527,7 @@ HTMLInputElement::SetWidth(uint32_t aWidth)
NS_IMETHODIMP
HTMLInputElement::GetValue(nsAString& aValue)
{
nsresult rv = GetValueInternal(aValue);
if (NS_FAILED(rv)) {
return rv;
}
GetValueInternal(aValue);
// Don't return non-sanitized value for types that are experimental on mobile.
if (IsExperimentalMobileType(mType)) {
@ -1547,8 +1544,8 @@ HTMLInputElement::GetValueInternal(nsAString& aValue) const
case VALUE_MODE_VALUE:
if (IsSingleLineTextControl(false)) {
mInputData.mState->GetValue(aValue, true);
} else if (!aValue.Assign(mInputData.mValue, fallible)) {
return NS_ERROR_OUT_OF_MEMORY;
} else {
aValue.Assign(mInputData.mValue);
}
return NS_OK;
@ -1684,15 +1681,6 @@ HTMLInputElement::GetValueAsDecimal() const
: decimalValue;
}
void
HTMLInputElement::GetValue(nsAString& aValue, ErrorResult& aRv)
{
nsresult rv = GetValue(aValue);
if (NS_FAILED(rv)) {
aRv.Throw(rv);
}
}
void
HTMLInputElement::SetValue(const nsAString& aValue, ErrorResult& aRv)
{
@ -5775,23 +5763,14 @@ HTMLInputElement::SaveState()
inputState = new HTMLInputElementState();
nsAutoString value;
nsresult rv = GetValue(value);
if (NS_FAILED(rv)) {
return rv;
}
if (!IsSingleLineTextControl(false)) {
rv = nsLinebreakConverter::ConvertStringLineBreaks(
value,
nsLinebreakConverter::eLinebreakPlatform,
nsLinebreakConverter::eLinebreakContent);
if (NS_FAILED(rv)) {
NS_ERROR("Converting linebreaks failed!");
return rv;
}
}
GetValue(value);
DebugOnly<nsresult> rv =
nsLinebreakConverter::ConvertStringLineBreaks(
value,
nsLinebreakConverter::eLinebreakPlatform,
nsLinebreakConverter::eLinebreakContent);
NS_ASSERTION(NS_SUCCEEDED(rv), "Converting linebreaks failed!");
inputState->SetValue(value);
break;
}

2
dom/html/HTMLInputElement.h
View File

@ -623,7 +623,7 @@ public:
SetHTMLAttr(nsGkAtoms::value, aValue, aRv);
}
void GetValue(nsAString& aValue, ErrorResult& aRv);
// XPCOM GetValue() is OK
void SetValue(const nsAString& aValue, ErrorResult& aRv);
Nullable<Date> GetValueAsDate(ErrorResult& aRv);

6
dom/html/HTMLTextAreaElement.cpp
View File

@ -1085,11 +1085,7 @@ HTMLTextAreaElement::SaveState()
value,
nsLinebreakConverter::eLinebreakPlatform,
nsLinebreakConverter::eLinebreakContent);
if (NS_FAILED(rv)) {
NS_ERROR("Converting linebreaks failed!");
return rv;
}
NS_ASSERTION(NS_SUCCEEDED(rv), "Converting linebreaks failed!");
nsCOMPtr<nsISupportsString> pState =
do_CreateInstance(NS_SUPPORTS_STRING_CONTRACTID);

2
dom/webidl/HTMLInputElement.webidl
View File

@ -86,7 +86,7 @@ interface HTMLInputElement : HTMLElement {
attribute DOMString type;
[Pure, SetterThrows]
attribute DOMString defaultValue;
[Pure, TreatNullAs=EmptyString, Throws]
[Pure, TreatNullAs=EmptyString, SetterThrows]
attribute DOMString value;
[Throws, Pref="dom.experimental_forms"]
attribute Date? valueAsDate;

6
xpcom/io/nsLinebreakConverter.cpp
View File

@ -464,9 +464,7 @@ nsLinebreakConverter::ConvertStringLineBreaks(nsString& aIoString,
// remember the old buffer in case
// we blow it away later
nsString::char_iterator stringBuf;
if (!aIoString.BeginWriting(stringBuf, fallible)) {
return NS_ERROR_OUT_OF_MEMORY;
}
aIoString.BeginWriting(stringBuf);
int32_t newLen;
@ -478,7 +476,7 @@ nsLinebreakConverter::ConvertStringLineBreaks(nsString& aIoString,
}
if (stringBuf != aIoString.get()) {
aIoString.Adopt(stringBuf, newLen - 1);
aIoString.Adopt(stringBuf);
}
return NS_OK;