corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1729343 - Remove unneeded virtual keywords in HTMLInputElement.h. r=smaug

Browse Source 
That's what our code style asks for. Also remove some redundant argument names
but let me know if you'd rather keep them.

Differential Revision: https://phabricator.services.mozilla.com/D124688
This commit is contained in:
Emilio Cobos Álvarez
2021-09-07 08:25:38 +00:00
parent 8bf9f725d7
commit f39aa2e77b
1 changed files with 67 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
dom/html/HTMLInputElement.h
View File

@@ -123,8 +123,8 @@ class HTMLInputElement final : public TextControlElement,
enum class FromClone { no, yes }; enum class FromClone { no, yes };
HTMLInputElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo, HTMLInputElement(already_AddRefed<dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser, FromParser aFromParser,
FromClone aFromClone = FromClone::no); FromClone aFromClone = FromClone::no);
NS_IMPL_FROMNODE_HTML_WITH_TAG(HTMLInputElement, input) NS_IMPL_FROMNODE_HTML_WITH_TAG(HTMLInputElement, input)
@@ -132,57 +132,56 @@ class HTMLInputElement final : public TextControlElement,
// nsISupports // nsISupports
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS_INHERITED
virtual int32_t TabIndexDefault() override; int32_t TabIndexDefault() override;
using nsGenericHTMLElement::Focus; using nsGenericHTMLElement::Focus;
virtual void Blur(ErrorResult& aError) override; void Blur(ErrorResult& aError) override;
virtual void Focus(const FocusOptions& aOptions, const CallerType aCallerType, void Focus(const FocusOptions& aOptions, CallerType aCallerType,
ErrorResult& aError) override; ErrorResult& aError) override;
// nsINode // nsINode
#if !defined(ANDROID) && !defined(XP_MACOSX) #if !defined(ANDROID) && !defined(XP_MACOSX)
virtual bool IsNodeApzAwareInternal() const override; bool IsNodeApzAwareInternal() const override;
#endif #endif
// Element // Element
virtual bool IsInteractiveHTMLContent() const override; bool IsInteractiveHTMLContent() const override;
// nsGenericHTMLElement // nsGenericHTMLElement
virtual bool IsDisabledForEvents(WidgetEvent* aEvent) override; bool IsDisabledForEvents(WidgetEvent* aEvent) override;
// nsGenericHTMLFormElement // nsGenericHTMLFormElement
void SaveState() override; void SaveState() override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY bool RestoreState(PresState* aState) override; MOZ_CAN_RUN_SCRIPT_BOUNDARY bool RestoreState(PresState* aState) override;
// EventTarget // EventTarget
virtual void AsyncEventRunning(AsyncEventDispatcher* aEvent) override; void AsyncEventRunning(AsyncEventDispatcher* aEvent) override;
// Overriden nsIFormControl methods // Overriden nsIFormControl methods
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
NS_IMETHOD Reset() override; NS_IMETHOD Reset() override;
NS_IMETHOD SubmitNamesValues(FormData* aFormData) override; NS_IMETHOD SubmitNamesValues(FormData* aFormData) override;
virtual bool AllowDrop() override; bool AllowDrop() override;
virtual void FieldSetDisabledChanged(bool aNotify) override; void FieldSetDisabledChanged(bool aNotify) override;
// nsIContent // nsIContent
virtual bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable, bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable,
int32_t* aTabIndex) override; int32_t* aTabIndex) override;
virtual bool ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute, bool ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
const nsAString& aValue, const nsAString& aValue,
nsIPrincipal* aMaybeScriptedPrincipal, nsIPrincipal* aMaybeScriptedPrincipal,
nsAttrValue& aResult) override; nsAttrValue& aResult) override;
virtual nsChangeHint GetAttributeChangeHint(const nsAtom* aAttribute, nsChangeHint GetAttributeChangeHint(const nsAtom* aAttribute,
int32_t aModType) const override; int32_t aModType) const override;
NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override; NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override;
virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction() nsMapRuleToAttributesFunc GetAttributeMappingFunction() const override;
const override;
void GetEventTargetParent(EventChainPreVisitor& aVisitor) override; void GetEventTargetParent(EventChainPreVisitor& aVisitor) override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
virtual nsresult PreHandleEvent(EventChainVisitor& aVisitor) override; nsresult PreHandleEvent(EventChainVisitor& aVisitor) override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
virtual nsresult PostHandleEvent(EventChainPostVisitor& aVisitor) override; nsresult PostHandleEvent(EventChainPostVisitor& aVisitor) override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
void PostHandleEventForRangeThumb(EventChainPostVisitor& aVisitor); void PostHandleEventForRangeThumb(EventChainPostVisitor& aVisitor);
MOZ_CAN_RUN_SCRIPT MOZ_CAN_RUN_SCRIPT
@@ -194,51 +193,49 @@ class HTMLInputElement final : public TextControlElement,
MOZ_CAN_RUN_SCRIPT MOZ_CAN_RUN_SCRIPT
void SetValueOfRangeForUserEvent(Decimal aValue); void SetValueOfRangeForUserEvent(Decimal aValue);
virtual nsresult BindToTree(BindContext&, nsINode& aParent) override; nsresult BindToTree(BindContext&, nsINode& aParent) override;
virtual void UnbindFromTree(bool aNullParent = true) override; void UnbindFromTree(bool aNullParent = true) override;
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
virtual void DoneCreatingElement() override; void DoneCreatingElement() override;
virtual void DestroyContent() override; void DestroyContent() override;
virtual EventStates IntrinsicState() const override; EventStates IntrinsicState() const override;
void SetLastValueChangeWasInteractive(bool); void SetLastValueChangeWasInteractive(bool);
// TextControlElement // TextControlElement
virtual nsresult SetValueChanged(bool aValueChanged) override; nsresult SetValueChanged(bool aValueChanged) override;
virtual bool IsSingleLineTextControl() const override; bool IsSingleLineTextControl() const override;
virtual bool IsTextArea() const override; bool IsTextArea() const override;
virtual bool IsPasswordTextControl() const override; bool IsPasswordTextControl() const override;
virtual int32_t GetCols() override; int32_t GetCols() override;
virtual int32_t GetWrapCols() override; int32_t GetWrapCols() override;
virtual int32_t GetRows() override; int32_t GetRows() override;
virtual void GetDefaultValueFromContent(nsAString& aValue) override; void GetDefaultValueFromContent(nsAString& aValue) override;
virtual bool ValueChanged() const override; bool ValueChanged() const override;
virtual void GetTextEditorValue(nsAString& aValue, void GetTextEditorValue(nsAString& aValue, bool aIgnoreWrap) const override;
bool aIgnoreWrap) const override;
MOZ_CAN_RUN_SCRIPT TextEditor* GetTextEditor() override; MOZ_CAN_RUN_SCRIPT TextEditor* GetTextEditor() override;
virtual TextEditor* GetTextEditorWithoutCreation() override; TextEditor* GetTextEditorWithoutCreation() override;
virtual nsISelectionController* GetSelectionController() override; nsISelectionController* GetSelectionController() override;
virtual nsFrameSelection* GetConstFrameSelection() override; nsFrameSelection* GetConstFrameSelection() override;
virtual TextControlState* GetTextControlState() const override { TextControlState* GetTextControlState() const override {
return GetEditorState(); return GetEditorState();
} }
virtual nsresult BindToFrame(nsTextControlFrame* aFrame) override; nsresult BindToFrame(nsTextControlFrame* aFrame) override;
MOZ_CAN_RUN_SCRIPT virtual void UnbindFromFrame( MOZ_CAN_RUN_SCRIPT void UnbindFromFrame(nsTextControlFrame* aFrame) override;
nsTextControlFrame* aFrame) override; MOZ_CAN_RUN_SCRIPT nsresult CreateEditor() override;
MOZ_CAN_RUN_SCRIPT virtual nsresult CreateEditor() override; void SetPreviewValue(const nsAString& aValue) override;
virtual void SetPreviewValue(const nsAString& aValue) override; void GetPreviewValue(nsAString& aValue) override;
virtual void GetPreviewValue(nsAString& aValue) override; void EnablePreview() override;
virtual void EnablePreview() override; bool IsPreviewEnabled() override;
virtual bool IsPreviewEnabled() override; void InitializeKeyboardEventListeners() override;
virtual void InitializeKeyboardEventListeners() override; void OnValueChanged(ValueChangeKind) override;
virtual void OnValueChanged(ValueChangeKind) override; void GetValueFromSetRangeText(nsAString& aValue) override;
virtual void GetValueFromSetRangeText(nsAString& aValue) override; MOZ_CAN_RUN_SCRIPT nsresult
MOZ_CAN_RUN_SCRIPT virtual nsresult SetValueFromSetRangeText( SetValueFromSetRangeText(const nsAString& aValue) override;
const nsAString& aValue) override; bool HasCachedSelection() override;
virtual bool HasCachedSelection() override;
/** /**
* TextEditorValueEquals() is designed for internal use so that aValue * TextEditorValueEquals() is designed for internal use so that aValue
@@ -284,7 +281,7 @@ class HTMLInputElement final : public TextControlElement,
HTMLInputElement* GetSelectedRadioButton() const; HTMLInputElement* GetSelectedRadioButton() const;
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override;
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLInputElement, TextControlElement) NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLInputElement, TextControlElement)
@@ -863,8 +860,8 @@ class HTMLInputElement final : public TextControlElement,
protected: protected:
MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual ~HTMLInputElement(); MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual ~HTMLInputElement();
virtual JSObject* WrapNode(JSContext* aCx, JSObject* WrapNode(JSContext* aCx,
JS::Handle<JSObject*> aGivenProto) override; JS::Handle<JSObject*> aGivenProto) override;
// Pull IsSingleLineTextControl into our scope, otherwise it'd be hidden // Pull IsSingleLineTextControl into our scope, otherwise it'd be hidden
// by the TextControlElement version. // by the TextControlElement version.
@@ -948,24 +945,22 @@ class HTMLInputElement final : public TextControlElement,
/** /**
* Called when an attribute is about to be changed * Called when an attribute is about to be changed
*/ */
virtual nsresult BeforeSetAttr(int32_t aNameSpaceID, nsAtom* aName, nsresult BeforeSetAttr(int32_t aNameSpaceID, nsAtom* aName,
const nsAttrValueOrString* aValue, const nsAttrValueOrString* aValue,
bool aNotify) override; bool aNotify) override;
/** /**
* Called when an attribute has just been changed * Called when an attribute has just been changed
*/ */
MOZ_CAN_RUN_SCRIPT_BOUNDARY MOZ_CAN_RUN_SCRIPT_BOUNDARY
virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName, nsresult AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
const nsAttrValue* aValue, const nsAttrValue* aValue, const nsAttrValue* aOldValue,
const nsAttrValue* aOldValue, nsIPrincipal* aSubjectPrincipal, bool aNotify) override;
nsIPrincipal* aSubjectPrincipal,
bool aNotify) override;
virtual void BeforeSetForm(bool aBindToTree) override; void BeforeSetForm(bool aBindToTree) override;
virtual void AfterClearForm(bool aUnbindOrDelete) override; void AfterClearForm(bool aUnbindOrDelete) override;
virtual void ResultForDialogSubmit(nsAString& aResult) override; void ResultForDialogSubmit(nsAString& aResult) override;
/** /**
* Dispatch a select event. * Dispatch a select event.