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

Merge mozilla-central to autoland. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Ciure Andrei
2019-01-04 01:03:06 +02:00
parent 31a62e33fe f73ccc2c0c
commit 212a44dc44
1017 changed files with 8903 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dom/html/nsGenericHTMLFrameElement.cpp
View File

@@ -69,13 +69,14 @@ nsGenericHTMLFrameElement::~nsGenericHTMLFrameElement() {
}
}
nsIDocument* nsGenericHTMLFrameElement::GetContentDocument(
Document* nsGenericHTMLFrameElement::GetContentDocument(
nsIPrincipal& aSubjectPrincipal) {
RefPtr<BrowsingContext> bc = GetContentWindowInternal();
if (!bc) {
return nullptr;
}
<<<<<<< working copy
nsPIDOMWindowOuter* window = bc->GetDOMWindow();
if (!window) {
// Either our browsing context contents are out-of-process (in which case
@@ -84,8 +85,7 @@ nsIDocument* nsGenericHTMLFrameElement::GetContentDocument(
// document, and we should still return null.
return nullptr;
}
nsIDocument* doc = window->GetDoc();
Document* doc = window->GetDoc();
if (!doc) {
return nullptr;
}
@@ -212,7 +212,7 @@ void nsGenericHTMLFrameElement::LoadSrc() {
mFrameLoader->LoadFrame(origSrc);
}
nsresult nsGenericHTMLFrameElement::BindToTree(nsIDocument* aDocument,
nsresult nsGenericHTMLFrameElement::BindToTree(Document* aDocument,
nsIContent* aParent,
nsIContent* aBindingParent) {
nsresult rv =
@@ -378,7 +378,7 @@ nsresult nsGenericHTMLFrameElement::CopyInnerTo(Element* aDest) {
nsresult rv = nsGenericHTMLElement::CopyInnerTo(aDest);
NS_ENSURE_SUCCESS(rv, rv);
nsIDocument* doc = aDest->OwnerDoc();
Document* doc = aDest->OwnerDoc();
if (doc->IsStaticDocument() && mFrameLoader) {
nsGenericHTMLFrameElement* dest =
static_cast<nsGenericHTMLFrameElement*>(aDest);