Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-07-04 07:02:08 +08:00
commit bd5506d13c
59 changed files with 1121 additions and 955 deletions

View file

@ -42,7 +42,7 @@ NS_IMPL_ISUPPORTS_INHERITED(SVGScriptElement, SVGScriptElementBase,
SVGScriptElement::SVGScriptElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
: SVGScriptElementBase(aNodeInfo)
, nsScriptElement(aFromParser)
, ScriptElement(aFromParser)
{
AddMutationObserver(this);
}
@ -168,7 +168,7 @@ SVGScriptElement::FreezeUriAsyncDefer()
}
//----------------------------------------------------------------------
// nsScriptElement methods
// ScriptElement methods
bool
SVGScriptElement::HasScriptContent()

View file

@ -10,7 +10,7 @@
#include "nsSVGElement.h"
#include "nsCOMPtr.h"
#include "nsSVGString.h"
#include "nsScriptElement.h"
#include "mozilla/dom/ScriptElement.h"
class nsIDocument;
@ -24,7 +24,7 @@ namespace dom {
typedef nsSVGElement SVGScriptElementBase;
class SVGScriptElement final : public SVGScriptElementBase,
public nsScriptElement
public ScriptElement
{
protected:
friend nsresult (::NS_NewSVGScriptElement(nsIContent **aResult,
@ -47,7 +47,7 @@ public:
virtual void FreezeUriAsyncDefer() override;
virtual CORSMode GetCORSMode() const override;
// nsScriptElement
// ScriptElement
virtual bool HasScriptContent() override;
// nsIContent specializations: