| 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 06c7f3153e7485af8302066a1d9a3e7c590a8d2d..d1fe72021bdfd89a0d1daa287f652454ecae505e 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
|
| @@ -530,15 +530,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());
|
| bool needsDefaultAction = dispatchEvent(Event::createCancelable(EventTypeNames::invalid));
|
| if (needsDefaultAction && unhandledInvalidControls && inDocument() && originalDocument == document())
|
| unhandledInvalidControls->append(this);
|
| @@ -548,14 +548,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;
|
|
|