diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-30 15:00:01 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-30 15:00:01 +0200 |
| commit | 966e69291ae8ca1615b7d9a2d4db28b6532564f5 (patch) | |
| tree | d1953f145739f0d653fd41c9ac2ebfd6adcfb145 | |
| parent | 7c8c0540db529cffdbcd142af74ea1a8df6be23f (diff) | |
| download | uxp-966e69291ae8ca1615b7d9a2d4db28b6532564f5.tar.gz | |
Bug 1216885 - Make nsISelectionPrivate not inherit from nsISelection
| -rw-r--r-- | dom/base/nsISelectionPrivate.idl | 2 | ||||
| -rw-r--r-- | layout/generic/Selection.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/dom/base/nsISelectionPrivate.idl b/dom/base/nsISelectionPrivate.idl index 68412885e3..049873b28b 100644 --- a/dom/base/nsISelectionPrivate.idl +++ b/dom/base/nsISelectionPrivate.idl @@ -29,7 +29,7 @@ native nsDirection(nsDirection); native ScrollAxis(nsIPresShell::ScrollAxis); [scriptable, builtinclass, uuid(0c9f4f74-ee7e-4fe9-be6b-0ba856368178)] -interface nsISelectionPrivate : nsISelection +interface nsISelectionPrivate : nsISupports { const short ENDOFPRECEDINGLINE=0; const short STARTOFNEXTLINE=1; diff --git a/layout/generic/Selection.h b/layout/generic/Selection.h index 3d5e334fc0..5414d15c12 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 |