Backed out changeset 3ff28843a8f8 (bug 1088761) for failing form-validation-reportValidity.html on OSX 10.10 debug. r=backout

This commit is contained in:
Sebastian Hengst 2016-05-12 13:19:22 +02:00
Родитель bf7ef7a9a1
Коммит acc64686c7
4 изменённых файлов: 26 добавлений и 26 удалений

Просмотреть файл

@ -464,7 +464,7 @@ HTMLFormElement::UnbindFromTree(bool aDeep, bool aNullParent)
}
ancestor = cur;
} while (1);
CollectOrphans(ancestor, mControls->mElements
#ifdef DEBUG
, this
@ -667,24 +667,24 @@ HTMLFormElement::DoSubmit(WidgetEvent* aEvent)
mSubmitInitiatedFromUserInput = EventStateManager::IsHandlingUserInput();
if(mDeferSubmission) {
if(mDeferSubmission) {
// we are in an event handler, JS submitted so we have to
// defer this submission. let's remember it and return
// without submitting
mPendingSubmission = submission;
// ensure reentrancy
mIsSubmitting = false;
return NS_OK;
}
//
return NS_OK;
}
//
// perform the submission
//
return SubmitSubmission(submission);
return SubmitSubmission(submission);
}
nsresult
HTMLFormElement::BuildSubmission(nsFormSubmission** aFormSubmission,
HTMLFormElement::BuildSubmission(nsFormSubmission** aFormSubmission,
WidgetEvent* aEvent)
{
NS_ASSERTION(!mPendingSubmission, "tried to build two submissions!");
@ -1066,10 +1066,10 @@ HTMLFormElement::WalkFormElements(nsFormSubmission* aFormSubmission)
// nsIForm
NS_IMETHODIMP_(uint32_t)
HTMLFormElement::GetElementCount() const
HTMLFormElement::GetElementCount() const
{
uint32_t count = 0;
mControls->GetLength(&count);
mControls->GetLength(&count);
return count;
}
@ -1262,7 +1262,7 @@ HTMLFormElement::AddElement(nsGenericHTMLFormElement* aChild,
}
PostPasswordEvent();
}
// Default submit element handling
if (aChild->IsSubmitControl()) {
// Update mDefaultSubmitElement, mFirstSubmitInElements,
@ -1270,7 +1270,7 @@ HTMLFormElement::AddElement(nsGenericHTMLFormElement* aChild,
nsGenericHTMLFormElement** firstSubmitSlot =
childInElements ? &mFirstSubmitInElements : &mFirstSubmitNotInElements;
// The new child is the new first submit in its list if the firstSubmitSlot
// is currently empty or if the child is before what's currently in the
// slot. Note that if we already have a control in firstSubmitSlot and
@ -1334,7 +1334,7 @@ nsresult
HTMLFormElement::AddElementToTable(nsGenericHTMLFormElement* aChild,
const nsAString& aName)
{
return mControls->AddElementToTable(aChild, aName);
return mControls->AddElementToTable(aChild, aName);
}
@ -1357,7 +1357,7 @@ HTMLFormElement::RemoveElement(nsGenericHTMLFormElement* aChild,
bool childInElements = HTMLFormControlsCollection::ShouldBeInElements(aChild);
nsTArray<nsGenericHTMLFormElement*>& controls = childInElements ?
mControls->mElements : mControls->mNotInElements;
// Find the index of the child. This will be used later if necessary
// to find the default submit.
size_t index = controls.IndexOf(aChild);
@ -1780,7 +1780,7 @@ HTMLFormElement::GetDefaultSubmitElement() const
NS_PRECONDITION(mDefaultSubmitElement == mFirstSubmitInElements ||
mDefaultSubmitElement == mFirstSubmitNotInElements,
"What happened here?");
return mDefaultSubmitElement;
}
@ -1839,7 +1839,7 @@ HTMLFormElement::GetEncoding(nsAString& aEncoding)
{
return GetEnctype(aEncoding);
}
NS_IMETHODIMP
HTMLFormElement::SetEncoding(const nsAString& aEncoding)
{
@ -1852,7 +1852,7 @@ HTMLFormElement::Length()
return mControls->Length();
}
NS_IMETHODIMP
NS_IMETHODIMP
HTMLFormElement::GetLength(int32_t* aLength)
{
*aLength = Length();
@ -2543,7 +2543,7 @@ HTMLFormElement::AddToPastNamesMap(const nsAString& aName,
mPastNameLookupTable.Put(aName, aChild);
}
}
JSObject*
HTMLFormElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{

Просмотреть файл

@ -1291,15 +1291,15 @@ protected:
RefPtr<Promise> mFilesAndDirectoriesPromise;
nsString mStaticDocFileList;
/**
/**
* The value of the input element when first initialized and it is updated
* when the element is either changed through a script, focused or dispatches
* when the element is either changed through a script, focused or dispatches
* a change event. This is to ensure correct future change event firing.
* NB: This is ONLY applicable where the element is a text control. ie,
* where type= "text", "email", "search", "tel", "url" or "password".
*/
nsString mFocusedValue;
nsString mFocusedValue;
/**
* If mIsDraggingRange is true, this is the value that the input had before
@ -1407,7 +1407,7 @@ private:
return false;
}
}
// Filter mask, using values defined in nsIFilePicker
int32_t mFilterMask;
// If mFilterMask is defined, mTitle and mFilter are useless and should be

Просмотреть файл

@ -378,7 +378,7 @@ public:
const nsAttrValue* aValue, bool aNotify) override;
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify) override;
virtual void DoneAddingChildren(bool aHaveNotified) override;
virtual bool IsDoneAddingChildren() override {
return mIsDoneAddingChildren;

Просмотреть файл

@ -304,9 +304,9 @@ protected:
bool mCanShowInvalidUI;
/** Whether we should make :-moz-ui-valid apply on the element. **/
bool mCanShowValidUI;
void FireChangeEventIfNeeded();
nsString mFocusedValue;
/** The state of the text editor (selection controller and the editor) **/