Merge pull request #309 from janekptacijarabaci/build_warnings_4

Build - throws a warning "interface 'nsISelectionPrivate' is scriptable but derives from non-scriptable 'nsISelection'"
This commit is contained in:
Moonchild
2018-05-01 09:55:55 +02:00
committed by GitHub
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -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;
+3 -2
View File
@@ -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
+1 -1
View File
@@ -529,7 +529,7 @@ class Interface(object):
raise IDLError("interface '%s' inherits from non-interface type '%s'" % (self.name, self.base), self.location)
if self.attributes.scriptable and not realbase.attributes.scriptable:
print >>sys.stderr, IDLError("interface '%s' is scriptable but derives from non-scriptable '%s'" % (self.name, self.base), self.location, warning=True)
raise IDLError("interface '%s' is scriptable but derives from non-scriptable '%s'" % (self.name, self.base), self.location, warning=True)
if self.attributes.scriptable and realbase.attributes.builtinclass and not self.attributes.builtinclass:
raise IDLError("interface '%s' is not builtinclass but derives from builtinclass '%s'" % (self.name, self.base), self.location)