| Index: Source/core/html/HTMLInputElement.h
|
| diff --git a/Source/core/html/HTMLInputElement.h b/Source/core/html/HTMLInputElement.h
|
| index d85b66b6b293b5468b5af3956521d667301f9465..ffd9f6fb2d189631f9e53ffe6b3061ec318efbb0 100644
|
| --- a/Source/core/html/HTMLInputElement.h
|
| +++ b/Source/core/html/HTMLInputElement.h
|
| @@ -51,18 +51,18 @@ public:
|
|
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitspeechchange);
|
|
|
| - virtual bool shouldAutocomplete() const;
|
| + virtual bool shouldAutocomplete() const OVERRIDE FINAL;
|
|
|
| // For ValidityState
|
| - virtual bool hasBadInput() const OVERRIDE;
|
| - virtual bool patternMismatch() const OVERRIDE;
|
| - virtual bool rangeUnderflow() const OVERRIDE;
|
| - virtual bool rangeOverflow() const;
|
| - virtual bool stepMismatch() const OVERRIDE;
|
| - virtual bool tooLong() const OVERRIDE;
|
| - virtual bool typeMismatch() const OVERRIDE;
|
| - virtual bool valueMissing() const OVERRIDE;
|
| - virtual String validationMessage() const OVERRIDE;
|
| + virtual bool hasBadInput() const OVERRIDE FINAL;
|
| + virtual bool patternMismatch() const OVERRIDE FINAL;
|
| + virtual bool rangeUnderflow() const OVERRIDE FINAL;
|
| + virtual bool rangeOverflow() const OVERRIDE FINAL;
|
| + virtual bool stepMismatch() const OVERRIDE FINAL;
|
| + virtual bool tooLong() const OVERRIDE FINAL;
|
| + virtual bool typeMismatch() const OVERRIDE FINAL;
|
| + virtual bool valueMissing() const OVERRIDE FINAL;
|
| + virtual String validationMessage() const OVERRIDE FINAL;
|
|
|
| // Returns the minimum value for type=date, number, or range. Don't call this for other types.
|
| double minimum() const;
|
| @@ -172,15 +172,15 @@ public:
|
| void setSelectionRangeForBinding(int start, int end, ExceptionState&);
|
| void setSelectionRangeForBinding(int start, int end, const String& direction, ExceptionState&);
|
|
|
| - virtual bool rendererIsNeeded(const RenderStyle&);
|
| - virtual RenderObject* createRenderer(RenderStyle*);
|
| - virtual void detach(const AttachContext& = AttachContext()) OVERRIDE;
|
| + virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE FINAL;
|
| + virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE;
|
| + virtual void detach(const AttachContext& = AttachContext()) OVERRIDE FINAL;
|
|
|
| // FIXME: For isActivatedSubmit and setActivatedSubmit, we should use the NVI-idiom here by making
|
| // it private virtual in all classes and expose a public method in HTMLFormControlElement to call
|
| // the private virtual method.
|
| - virtual bool isActivatedSubmit() const;
|
| - virtual void setActivatedSubmit(bool flag);
|
| + virtual bool isActivatedSubmit() const OVERRIDE FINAL;
|
| + virtual void setActivatedSubmit(bool flag) OVERRIDE FINAL;
|
|
|
| String altText() const;
|
|
|
| @@ -198,7 +198,7 @@ public:
|
|
|
| KURL src() const;
|
|
|
| - virtual int maxLength() const;
|
| + virtual int maxLength() const OVERRIDE FINAL;
|
| void setMaxLength(int, ExceptionState&);
|
|
|
| bool multiple() const;
|
| @@ -252,20 +252,20 @@ public:
|
| void setHeight(unsigned);
|
| void setWidth(unsigned);
|
|
|
| - virtual void blur() OVERRIDE;
|
| + virtual void blur() OVERRIDE FINAL;
|
| void defaultBlur();
|
|
|
| - virtual const AtomicString& name() const OVERRIDE;
|
| + virtual const AtomicString& name() const OVERRIDE FINAL;
|
|
|
| void beginEditing();
|
| void endEditing();
|
|
|
| static Vector<FileChooserFileInfo> filesFromFileInputFormControlState(const FormControlState&);
|
|
|
| - virtual bool matchesReadOnlyPseudoClass() const OVERRIDE;
|
| - virtual bool matchesReadWritePseudoClass() const OVERRIDE;
|
| - virtual void setRangeText(const String& replacement, ExceptionState&) OVERRIDE;
|
| - virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionState&) OVERRIDE;
|
| + virtual bool matchesReadOnlyPseudoClass() const OVERRIDE FINAL;
|
| + virtual bool matchesReadWritePseudoClass() const OVERRIDE FINAL;
|
| + virtual void setRangeText(const String& replacement, ExceptionState&) OVERRIDE FINAL;
|
| + virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionState&) OVERRIDE FINAL;
|
|
|
| bool hasImageLoader() const { return m_imageLoader; }
|
| HTMLImageLoader* imageLoader();
|
| @@ -282,79 +282,79 @@ protected:
|
| private:
|
| enum AutoCompleteSetting { Uninitialized, On, Off };
|
|
|
| - virtual void didAddUserAgentShadowRoot(ShadowRoot&) OVERRIDE;
|
| - virtual void didAddShadowRoot(ShadowRoot&) OVERRIDE;
|
| + virtual void didAddUserAgentShadowRoot(ShadowRoot&) OVERRIDE FINAL;
|
| + virtual void didAddShadowRoot(ShadowRoot&) OVERRIDE FINAL;
|
|
|
| - virtual void willChangeForm() OVERRIDE;
|
| - virtual void didChangeForm() OVERRIDE;
|
| + virtual void willChangeForm() OVERRIDE FINAL;
|
| + virtual void didChangeForm() OVERRIDE FINAL;
|
| virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
|
| - virtual void removedFrom(ContainerNode*) OVERRIDE;
|
| - virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE;
|
| + virtual void removedFrom(ContainerNode*) OVERRIDE FINAL;
|
| + virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE FINAL;
|
|
|
| - virtual bool hasCustomFocusLogic() const OVERRIDE;
|
| - virtual bool isKeyboardFocusable() const OVERRIDE;
|
| - virtual bool shouldShowFocusRingOnMouseFocus() const OVERRIDE;
|
| - virtual bool isEnumeratable() const;
|
| - virtual bool isInteractiveContent() const OVERRIDE;
|
| - virtual bool supportLabels() const OVERRIDE;
|
| - virtual void updateFocusAppearance(bool restorePreviousSelection);
|
| - virtual bool shouldUseInputMethod();
|
| + virtual bool hasCustomFocusLogic() const OVERRIDE FINAL;
|
| + virtual bool isKeyboardFocusable() const OVERRIDE FINAL;
|
| + virtual bool shouldShowFocusRingOnMouseFocus() const OVERRIDE FINAL;
|
| + virtual bool isEnumeratable() const OVERRIDE FINAL;
|
| + virtual bool isInteractiveContent() const OVERRIDE FINAL;
|
| + virtual bool supportLabels() const OVERRIDE FINAL;
|
| + virtual void updateFocusAppearance(bool restorePreviousSelection) OVERRIDE FINAL;
|
| + virtual bool shouldUseInputMethod() OVERRIDE FINAL;
|
|
|
| - virtual bool isTextFormControl() const { return isTextField(); }
|
| + virtual bool isTextFormControl() const OVERRIDE FINAL { return isTextField(); }
|
|
|
| - virtual bool canTriggerImplicitSubmission() const { return isTextField(); }
|
| + virtual bool canTriggerImplicitSubmission() const OVERRIDE FINAL { return isTextField(); }
|
|
|
| - virtual const AtomicString& formControlType() const;
|
| + virtual const AtomicString& formControlType() const OVERRIDE FINAL;
|
|
|
| - virtual bool shouldSaveAndRestoreFormControlState() const OVERRIDE;
|
| - virtual FormControlState saveFormControlState() const OVERRIDE;
|
| - virtual void restoreFormControlState(const FormControlState&) OVERRIDE;
|
| + virtual bool shouldSaveAndRestoreFormControlState() const OVERRIDE FINAL;
|
| + virtual FormControlState saveFormControlState() const OVERRIDE FINAL;
|
| + virtual void restoreFormControlState(const FormControlState&) OVERRIDE FINAL;
|
|
|
| - virtual bool canStartSelection() const;
|
| + virtual bool canStartSelection() const OVERRIDE FINAL;
|
|
|
| - virtual void accessKeyAction(bool sendMouseEvents);
|
| + virtual void accessKeyAction(bool sendMouseEvents) OVERRIDE FINAL;
|
|
|
| virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
|
| - virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
|
| - virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) OVERRIDE;
|
| - virtual void finishParsingChildren();
|
| + virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE FINAL;
|
| + virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) OVERRIDE FINAL;
|
| + virtual void finishParsingChildren() OVERRIDE FINAL;
|
|
|
| - virtual void copyNonAttributePropertiesFromElement(const Element&);
|
| + virtual void copyNonAttributePropertiesFromElement(const Element&) OVERRIDE FINAL;
|
|
|
| - virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
|
| + virtual void attach(const AttachContext& = AttachContext()) OVERRIDE FINAL;
|
|
|
| - virtual bool appendFormData(FormDataList&, bool) OVERRIDE;
|
| - virtual String resultForDialogSubmit() OVERRIDE;
|
| + virtual bool appendFormData(FormDataList&, bool) OVERRIDE FINAL;
|
| + virtual String resultForDialogSubmit() OVERRIDE FINAL;
|
|
|
| - virtual bool canBeSuccessfulSubmitButton() const OVERRIDE;
|
| + virtual bool canBeSuccessfulSubmitButton() const OVERRIDE FINAL;
|
|
|
| - virtual void resetImpl() OVERRIDE;
|
| + virtual void resetImpl() OVERRIDE FINAL;
|
|
|
| - virtual void* preDispatchEventHandler(Event*);
|
| - virtual void postDispatchEventHandler(Event*, void* dataFromPreDispatch);
|
| + virtual void* preDispatchEventHandler(Event*) OVERRIDE FINAL;
|
| + virtual void postDispatchEventHandler(Event*, void* dataFromPreDispatch) OVERRIDE FINAL;
|
|
|
| - virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
|
| - virtual bool isInRange() const;
|
| - virtual bool isOutOfRange() const;
|
| + virtual bool isURLAttribute(const Attribute&) const OVERRIDE FINAL;
|
| + virtual bool isInRange() const OVERRIDE FINAL;
|
| + virtual bool isOutOfRange() const OVERRIDE FINAL;
|
|
|
| bool isTextType() const;
|
| bool tooLong(const String&, NeedsToCheckDirtyFlag) const;
|
|
|
| - virtual bool supportsPlaceholder() const;
|
| - virtual void updatePlaceholderText();
|
| - virtual bool isEmptyValue() const OVERRIDE { return innerTextValue().isEmpty(); }
|
| - virtual bool isEmptySuggestedValue() const { return suggestedValue().isEmpty(); }
|
| - virtual void handleFocusEvent(Element* oldFocusedElement, FocusDirection) OVERRIDE;
|
| - virtual void handleBlurEvent();
|
| + virtual bool supportsPlaceholder() const OVERRIDE FINAL;
|
| + virtual void updatePlaceholderText() OVERRIDE FINAL;
|
| + virtual bool isEmptyValue() const OVERRIDE FINAL { return innerTextValue().isEmpty(); }
|
| + virtual bool isEmptySuggestedValue() const OVERRIDE FINAL { return suggestedValue().isEmpty(); }
|
| + virtual void handleFocusEvent(Element* oldFocusedElement, FocusDirection) OVERRIDE FINAL;
|
| + virtual void handleBlurEvent() OVERRIDE FINAL;
|
|
|
| - virtual bool isOptionalFormControl() const { return !isRequiredFormControl(); }
|
| - virtual bool isRequiredFormControl() const;
|
| - virtual bool recalcWillValidate() const;
|
| - virtual void requiredAttributeChanged() OVERRIDE;
|
| + virtual bool isOptionalFormControl() const OVERRIDE FINAL { return !isRequiredFormControl(); }
|
| + virtual bool isRequiredFormControl() const OVERRIDE FINAL;
|
| + virtual bool recalcWillValidate() const OVERRIDE FINAL;
|
| + virtual void requiredAttributeChanged() OVERRIDE FINAL;
|
|
|
| void updateType();
|
|
|
| - virtual void subtreeHasChanged();
|
| + virtual void subtreeHasChanged() OVERRIDE FINAL;
|
|
|
| void resetListAttributeTargetObserver();
|
| void parseMaxLengthAttribute(const AtomicString&);
|
|
|