mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- include limits for numeric_limits in gcc 11 (e46f1407b) - Bug 1201057 - Move AutoEnterOOMUnsafeRegion to Utility.h with the other OOM simulation infrastructure r=terrence (ba11ded16) - Bug 1189490 - Part 0: Add a FIFO queue container type to js/public. r=terrence (97bd6e58d) - Bug 1189490 - Part 1: Add a JS::Traceable version of the FIFO queue for use with GC things. r=terrence (0e397ee31) - Bug 1144797 - Add setInterval and clearInterval to Timer.jsm. r=smacleod. (8aee45f35) - Bug 1182316: Part 3 - Add assertions to most other WebIDL entry points, clean up nsIDOMJSWindow cruft. r=peterv (d2af349b5) - Bug 1181762. Remove uses of mozRequestAnimationFrame from toolkit code. r=gijs (c5d4fe108) - Bug 1181765. Remove uses of mozRequestAnimationFrame from layout tests. r=bkelly (bd0b1300b) - Bug 1181966. Remove uses of mozRequestAnimationFrame from browser code. r=gijs,paul (64ce1b945) - Bug 909154. Remove the prefixed mozRequestAnimationFrame and its accoutrements. r=bkelly (0257521ce) - Bug 1185028. Fix GCJsonifierMethod to correctly handle worker descriptors. r=nsm (32c80ced6) - Bug 1181678 - Expose an attribute on DOMWindowUtils to see if APZ is enabled. r=botond (842c775c7)
This commit is contained in:
@@ -103,7 +103,6 @@
|
||||
#include "nsIRequest.h"
|
||||
#include "nsHtml5TreeOpExecutor.h"
|
||||
#include "nsHtml5Parser.h"
|
||||
#include "nsIDOMJSWindow.h"
|
||||
#include "nsSandboxFlags.h"
|
||||
#include "nsIImageDocument.h"
|
||||
#include "mozilla/dom/HTMLBodyElement.h"
|
||||
@@ -1402,12 +1401,17 @@ nsHTMLDocument::Open(JSContext* /* unused */,
|
||||
NS_ASSERTION(nsContentUtils::CanCallerAccess(static_cast<nsIDOMHTMLDocument*>(this)),
|
||||
"XOW should have caught this!");
|
||||
|
||||
nsCOMPtr<nsIDOMWindow> window = GetInnerWindow();
|
||||
nsCOMPtr<nsPIDOMWindow> window = GetInnerWindow();
|
||||
if (!window) {
|
||||
rv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);
|
||||
return nullptr;
|
||||
}
|
||||
nsCOMPtr<nsIDOMJSWindow> win = do_QueryInterface(window);
|
||||
window = nsPIDOMWindow::GetOuterFromCurrentInner(window);
|
||||
if (!window) {
|
||||
rv.Throw(NS_ERROR_NOT_INITIALIZED);
|
||||
return nullptr;
|
||||
}
|
||||
nsRefPtr<nsGlobalWindow> win = static_cast<nsGlobalWindow*>(window.get());
|
||||
nsCOMPtr<nsIDOMWindow> newWindow;
|
||||
// XXXbz We ignore aReplace for now.
|
||||
rv = win->OpenJS(aURL, aName, aFeatures, getter_AddRefs(newWindow));
|
||||
|
||||
Reference in New Issue
Block a user