summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-01 09:55:55 +0200
committerGitHub <noreply@github.com>2018-05-01 09:55:55 +0200
commitd0c19e4607964c04109e12399e98e86b331edd0f (patch)
tree4fa8d617c40af1a80e82c79b635bb4d725059146 /layout
parent0913ffa0cdee200fd30055bbfc1054c639c7866c (diff)
parent83e6cb541070f5ac9b31a1b6d146c0992c44c81e (diff)
downloadUXP-d0c19e4607964c04109e12399e98e86b331edd0f.tar
UXP-d0c19e4607964c04109e12399e98e86b331edd0f.tar.gz
UXP-d0c19e4607964c04109e12399e98e86b331edd0f.tar.lz
UXP-d0c19e4607964c04109e12399e98e86b331edd0f.tar.xz
UXP-d0c19e4607964c04109e12399e98e86b331edd0f.zip
Merge pull request #309 from janekptacijarabaci/build_warnings_4
Build - throws a warning "interface 'nsISelectionPrivate' is scriptable but derives from non-scriptable 'nsISelection'"
Diffstat (limited to 'layout')
-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