| Index: third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| index 65729e11fb8bc833fe496e243f215d84da25caa6..5c439f77bf6d8b2f2de593cf53518ef678d78dad 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| @@ -534,15 +534,15 @@ ValidationMessageClient* HTMLFormControlElement::validationMessageClient() const
|
| return &page->validationMessageClient();
|
| }
|
|
|
| -bool HTMLFormControlElement::checkValidity(WillBeHeapVector<RefPtrWillBeMember<HTMLFormControlElement>>* unhandledInvalidControls, CheckValidityEventBehavior eventBehavior)
|
| +bool HTMLFormControlElement::checkValidity(HeapVector<Member<HTMLFormControlElement>>* unhandledInvalidControls, CheckValidityEventBehavior eventBehavior)
|
| {
|
| if (isValidElement())
|
| return true;
|
| if (eventBehavior != CheckValidityDispatchInvalidEvent)
|
| return false;
|
| // An event handler can deref this object.
|
| - RefPtrWillBeRawPtr<HTMLFormControlElement> protector(this);
|
| - RefPtrWillBeRawPtr<Document> originalDocument(document());
|
| + RawPtr<HTMLFormControlElement> protector(this);
|
| + RawPtr<Document> originalDocument(document());
|
| DispatchEventResult dispatchResult = dispatchEvent(Event::createCancelable(EventTypeNames::invalid));
|
| if (dispatchResult == DispatchEventResult::NotCanceled && unhandledInvalidControls && inDocument() && originalDocument == document())
|
| unhandledInvalidControls->append(this);
|
| @@ -552,14 +552,14 @@ bool HTMLFormControlElement::checkValidity(WillBeHeapVector<RefPtrWillBeMember<H
|
| void HTMLFormControlElement::showValidationMessage()
|
| {
|
| scrollIntoViewIfNeeded(false);
|
| - RefPtrWillBeRawPtr<HTMLFormControlElement> protector(this);
|
| + RawPtr<HTMLFormControlElement> protector(this);
|
| focus();
|
| updateVisibleValidationMessage();
|
| }
|
|
|
| bool HTMLFormControlElement::reportValidity()
|
| {
|
| - WillBeHeapVector<RefPtrWillBeMember<HTMLFormControlElement>> unhandledInvalidControls;
|
| + HeapVector<Member<HTMLFormControlElement>> unhandledInvalidControls;
|
| bool isValid = checkValidity(&unhandledInvalidControls, CheckValidityDispatchInvalidEvent);
|
| if (isValid || unhandledInvalidControls.isEmpty())
|
| return isValid;
|
|
|