corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge inbound to mozilla-central r=merge a=merge

Browse Source
This commit is contained in:
Csoregi Natalia
2017-11-14 00:57:47 +02:00
parent 412f311247 367305ed8f
commit 16a1261797
102 changed files with 1607 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
dom/html/nsHTMLDocument.cpp
View File

@@ -1147,13 +1147,6 @@ nsHTMLDocument::GetHead(nsISupports** aHead)
return head ? CallQueryInterface(head, aHead) : NS_OK;
}
NS_IMETHODIMP
nsHTMLDocument::GetImages(nsIDOMHTMLCollection** aImages)
{
NS_ADDREF(*aImages = Images());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Images()
{
@@ -1163,13 +1156,6 @@ nsHTMLDocument::Images()
return mImages;
}
NS_IMETHODIMP
nsHTMLDocument::GetApplets(nsIDOMHTMLCollection** aApplets)
{
NS_ADDREF(*aApplets = Applets());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Applets()
{
@@ -1211,13 +1197,6 @@ nsHTMLDocument::MatchLinks(Element* aElement, int32_t aNamespaceID,
return false;
}
NS_IMETHODIMP
nsHTMLDocument::GetLinks(nsIDOMHTMLCollection** aLinks)
{
NS_ADDREF(*aLinks = Links());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Links()
{
@@ -1251,13 +1230,6 @@ nsHTMLDocument::MatchAnchors(Element* aElement, int32_t aNamespaceID,
return false;
}
NS_IMETHODIMP
nsHTMLDocument::GetAnchors(nsIDOMHTMLCollection** aAnchors)
{
NS_ADDREF(*aAnchors = Anchors());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Anchors()
{
@@ -1267,13 +1239,6 @@ nsHTMLDocument::Anchors()
return mAnchors;
}
NS_IMETHODIMP
nsHTMLDocument::GetScripts(nsIDOMHTMLCollection** aScripts)
{
NS_ADDREF(*aScripts = Scripts());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Scripts()
{
@@ -1974,8 +1939,11 @@ nsHTMLDocument::WriteCommon(JSContext *cx,
mDocumentURI);
return NS_OK;
}
// The spec doesn't tell us to ignore opens from here, but we need to
// ensure opens are ignored here.
IgnoreOpensDuringUnload ignoreOpenGuard(this);
mParser->Terminate();
NS_ASSERTION(!mParser, "mParser should have been null'd out");
MOZ_RELEASE_ASSERT(!mParser, "mParser should have been null'd out");
}
if (!mParser) {
@@ -2202,13 +2170,6 @@ nsHTMLDocument::SetFgColor(const nsAString& aFgColor)
}
NS_IMETHODIMP
nsHTMLDocument::GetEmbeds(nsIDOMHTMLCollection** aEmbeds)
{
NS_ADDREF(*aEmbeds = Embeds());
return NS_OK;
}
nsIHTMLCollection*
nsHTMLDocument::Embeds()
{
@@ -2241,14 +2202,6 @@ nsHTMLDocument::ReleaseEvents()
}
// Mapped to document.embeds for NS4 compatibility
NS_IMETHODIMP
nsHTMLDocument::GetPlugins(nsIDOMHTMLCollection** aPlugins)
{
*aPlugins = nullptr;
return GetEmbeds(aPlugins);
}
nsIHTMLCollection*
nsHTMLDocument::Plugins()
{
@@ -2331,13 +2284,6 @@ nsHTMLDocument::GetSupportedNames(nsTArray<nsString>& aNames)
// forms related stuff
NS_IMETHODIMP
nsHTMLDocument::GetForms(nsIDOMHTMLCollection** aForms)
{
NS_ADDREF(*aForms = nsHTMLDocument::GetForms());
return NS_OK;
}
nsContentList*
nsHTMLDocument::GetForms()
{