summaryrefslogtreecommitdiffstats
path: root/layout/generic/Selection.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-14 10:50:01 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-14 10:50:01 +0200
commite9dd029f5d00590e1a53e63b0ab805110a10b54c (patch)
tree1126ca5dda925a62be3dc12c99c90e953d08afcf /layout/generic/Selection.h
parent9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (diff)
parent36b8fd734f590eb726ca2e50f8d1ff9cc968b8e1 (diff)
downloadUXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.gz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.lz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.tar.xz
UXP-e9dd029f5d00590e1a53e63b0ab805110a10b54c.zip
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'layout/generic/Selection.h')
-rw-r--r--layout/generic/Selection.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/layout/generic/Selection.h b/layout/generic/Selection.h
index 3d5e334fc..5414d15c1 100644
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -51,8 +51,9 @@ struct RangeData
namespace mozilla {
namespace dom {
-class Selection final : public nsISelectionPrivate,
+class Selection final : public nsISelection,
public nsWrapperCache,
+ public nsISelectionPrivate,
public nsSupportsWeakReference
{
protected:
@@ -63,7 +64,7 @@ public:
explicit Selection(nsFrameSelection *aList);
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
- NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Selection, nsISelectionPrivate)
+ NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Selection, nsISelection)
NS_DECL_NSISELECTION
NS_DECL_NSISELECTIONPRIVATE