diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
| commit | a6f632714fcb1be3dd00b0fc76fbf6bfc693155b (patch) | |
| tree | b04c82f9af4a0d288a6d4350d774ad8fe6dac903 /editor/libeditor/HTMLEditor.h | |
| parent | 2ed0607c747b21cadaf7401d4ba706097578e74d (diff) | |
| parent | b28effe2ea93e43e362f7ce263d23b55adcb6da7 (diff) | |
| download | UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.gz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.lz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.tar.xz UXP-a6f632714fcb1be3dd00b0fc76fbf6bfc693155b.zip | |
Merge branch 'redwood' into releaseRELBASE_20200831
Diffstat (limited to 'editor/libeditor/HTMLEditor.h')
| -rw-r--r-- | editor/libeditor/HTMLEditor.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/editor/libeditor/HTMLEditor.h b/editor/libeditor/HTMLEditor.h index dfcdd8d6b..090e3f56c 100644 --- a/editor/libeditor/HTMLEditor.h +++ b/editor/libeditor/HTMLEditor.h @@ -118,6 +118,16 @@ public: virtual already_AddRefed<nsIContent> GetInputEventTargetContent() override; virtual bool IsEditable(nsINode* aNode) override; using EditorBase::IsEditable; + virtual nsresult RemoveAttributeOrEquivalent( + Element* aElement, + nsIAtom* aAttribute, + bool aSuppressTransaction) override; + virtual nsresult SetAttributeOrEquivalent(Element* aElement, + nsIAtom* aAttribute, + const nsAString& aValue, + bool aSuppressTransaction) override; + using EditorBase::RemoveAttributeOrEquivalent; + using EditorBase::SetAttributeOrEquivalent; // nsStubMutationObserver overrides NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED @@ -329,14 +339,6 @@ public: */ virtual nsresult SelectEntireDocument(Selection* aSelection) override; - NS_IMETHOD SetAttributeOrEquivalent(nsIDOMElement* aElement, - const nsAString& aAttribute, - const nsAString& aValue, - bool aSuppressTransaction) override; - NS_IMETHOD RemoveAttributeOrEquivalent(nsIDOMElement* aElement, - const nsAString& aAttribute, - bool aSuppressTransaction) override; - /** * Join together any adjacent editable text nodes in the range. */ |