mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out 2 changesets (bug 1221992) for windows debug assertions in browser_perf-categories-js-calltree.js
Backed out changeset bcd90e591038 (bug 1221992) Backed out changeset 6affaa386b9b (bug 1221992)
This commit is contained in:
parent
3621b07f35
commit
4959875fde
@ -162,7 +162,6 @@
|
|||||||
#include "nsIURIWithPrincipal.h"
|
#include "nsIURIWithPrincipal.h"
|
||||||
#include "nsIURL.h"
|
#include "nsIURL.h"
|
||||||
#include "nsIWebNavigation.h"
|
#include "nsIWebNavigation.h"
|
||||||
#include "nsIWindowMediator.h"
|
|
||||||
#include "nsIWordBreaker.h"
|
#include "nsIWordBreaker.h"
|
||||||
#include "nsIXPConnect.h"
|
#include "nsIXPConnect.h"
|
||||||
#include "nsJSUtils.h"
|
#include "nsJSUtils.h"
|
||||||
@ -5168,23 +5167,6 @@ nsContentUtils::GetWindowProviderForContentProcess()
|
|||||||
return ContentChild::GetSingleton();
|
return ContentChild::GetSingleton();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
|
||||||
already_AddRefed<nsPIDOMWindow>
|
|
||||||
nsContentUtils::GetMostRecentNonPBWindow()
|
|
||||||
{
|
|
||||||
nsCOMPtr<nsIWindowMediator> windowMediator =
|
|
||||||
do_GetService(NS_WINDOWMEDIATOR_CONTRACTID);
|
|
||||||
nsCOMPtr<nsIWindowMediator_44> wm = do_QueryInterface(windowMediator);
|
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMWindow> window;
|
|
||||||
wm->GetMostRecentNonPBWindow(MOZ_UTF16("navigator:browser"),
|
|
||||||
getter_AddRefs(window));
|
|
||||||
nsCOMPtr<nsPIDOMWindow> pwindow;
|
|
||||||
pwindow = do_QueryInterface(window);
|
|
||||||
|
|
||||||
return pwindow.forget();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
void
|
void
|
||||||
nsContentUtils::WarnScriptWasIgnored(nsIDocument* aDocument)
|
nsContentUtils::WarnScriptWasIgnored(nsIDocument* aDocument)
|
||||||
|
@ -1666,11 +1666,6 @@ public:
|
|||||||
static nsIWindowProvider*
|
static nsIWindowProvider*
|
||||||
GetWindowProviderForContentProcess();
|
GetWindowProviderForContentProcess();
|
||||||
|
|
||||||
// Returns the browser window with the most recent time stamp that is
|
|
||||||
// not in private browsing mode.
|
|
||||||
static already_AddRefed<nsPIDOMWindow>
|
|
||||||
GetMostRecentNonPBWindow();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Call this function if !IsSafeToRunScript() and we fail to run the script
|
* Call this function if !IsSafeToRunScript() and we fail to run the script
|
||||||
* (rather than using AddScriptRunner as we usually do). |aDocument| is
|
* (rather than using AddScriptRunner as we usually do). |aDocument| is
|
||||||
|
@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
|
|||||||
var file = location.href;
|
var file = location.href;
|
||||||
var asyncFrame;
|
var asyncFrame;
|
||||||
/* Async parent frames from pushPrefEnv don't show up in e10s. */
|
/* Async parent frames from pushPrefEnv don't show up in e10s. */
|
||||||
var isE10S = !SpecialPowers.isMainProcess();
|
var isE10S = !SpecialPowers.Services.wm.getMostRecentWindow("navigator:browser");
|
||||||
if (!isE10S && SpecialPowers.getBoolPref("javascript.options.asyncstack")) {
|
if (!isE10S && SpecialPowers.getBoolPref("javascript.options.asyncstack")) {
|
||||||
asyncFrame = `Async*@${file}:153:1
|
asyncFrame = `Async*@${file}:153:1
|
||||||
`;
|
`;
|
||||||
|
@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1107592
|
|||||||
function doTest() {
|
function doTest() {
|
||||||
var t = new TestInterfaceJS();
|
var t = new TestInterfaceJS();
|
||||||
/* Async parent frames from pushPrefEnv don't show up in e10s. */
|
/* Async parent frames from pushPrefEnv don't show up in e10s. */
|
||||||
var isE10S = !SpecialPowers.isMainProcess();
|
var isE10S = !SpecialPowers.Services.wm.getMostRecentWindow("navigator:browser");
|
||||||
var asyncStack = SpecialPowers.getBoolPref("javascript.options.asyncstack");
|
var asyncStack = SpecialPowers.getBoolPref("javascript.options.asyncstack");
|
||||||
var ourFile = location.href;
|
var ourFile = location.href;
|
||||||
var parentFrame = (asyncStack && !isE10S) ? `Async*@${ourFile}:121:1
|
var parentFrame = (asyncStack && !isE10S) ? `Async*@${ourFile}:121:1
|
||||||
|
@ -148,6 +148,7 @@
|
|||||||
#include "nsISystemMessagesInternal.h"
|
#include "nsISystemMessagesInternal.h"
|
||||||
#include "nsITimer.h"
|
#include "nsITimer.h"
|
||||||
#include "nsIURIFixup.h"
|
#include "nsIURIFixup.h"
|
||||||
|
#include "nsIWindowMediator.h"
|
||||||
#include "nsIDocShellTreeOwner.h"
|
#include "nsIDocShellTreeOwner.h"
|
||||||
#include "nsIXULWindow.h"
|
#include "nsIXULWindow.h"
|
||||||
#include "nsIDOMChromeWindow.h"
|
#include "nsIDOMChromeWindow.h"
|
||||||
@ -5388,6 +5389,34 @@ ContentParent::DeallocPWebBrowserPersistDocumentParent(PWebBrowserPersistDocumen
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static already_AddRefed<nsPIDOMWindow>
|
||||||
|
FindMostRecentOpenWindow()
|
||||||
|
{
|
||||||
|
nsCOMPtr<nsIWindowMediator> windowMediator =
|
||||||
|
do_GetService(NS_WINDOWMEDIATOR_CONTRACTID);
|
||||||
|
nsCOMPtr<nsISimpleEnumerator> windowEnumerator;
|
||||||
|
windowMediator->GetEnumerator(MOZ_UTF16("navigator:browser"),
|
||||||
|
getter_AddRefs(windowEnumerator));
|
||||||
|
|
||||||
|
nsCOMPtr<nsPIDOMWindow> latest;
|
||||||
|
|
||||||
|
bool hasMore = false;
|
||||||
|
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(windowEnumerator->HasMoreElements(&hasMore)));
|
||||||
|
while (hasMore) {
|
||||||
|
nsCOMPtr<nsISupports> item;
|
||||||
|
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(windowEnumerator->GetNext(getter_AddRefs(item))));
|
||||||
|
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(item);
|
||||||
|
|
||||||
|
if (window && !window->Closed()) {
|
||||||
|
latest = window;
|
||||||
|
}
|
||||||
|
|
||||||
|
MOZ_ALWAYS_TRUE(NS_SUCCEEDED(windowEnumerator->HasMoreElements(&hasMore)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return latest.forget();
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
|
ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
|
||||||
PBrowserParent* aNewTab,
|
PBrowserParent* aNewTab,
|
||||||
@ -5461,7 +5490,7 @@ ContentParent::RecvCreateWindow(PBrowserParent* aThisTab,
|
|||||||
// If we haven't found a chrome window to open in, just use the most recently
|
// If we haven't found a chrome window to open in, just use the most recently
|
||||||
// opened one.
|
// opened one.
|
||||||
if (!parent) {
|
if (!parent) {
|
||||||
parent = nsContentUtils::GetMostRecentNonPBWindow();
|
parent = FindMostRecentOpenWindow();
|
||||||
if (NS_WARN_IF(!parent)) {
|
if (NS_WARN_IF(!parent)) {
|
||||||
*aResult = NS_ERROR_FAILURE;
|
*aResult = NS_ERROR_FAILURE;
|
||||||
return true;
|
return true;
|
||||||
|
@ -615,9 +615,10 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Find the most recent browser window and open a new tab in it.
|
// Find the most recent browser window and open a new tab in it.
|
||||||
nsCOMPtr<nsPIDOMWindow> browserWindow =
|
nsCOMPtr<nsIDOMWindow> browserWindow;
|
||||||
nsContentUtils::GetMostRecentNonPBWindow();
|
rv = wm->GetMostRecentWindow(MOZ_UTF16("navigator:browser"),
|
||||||
if (!browserWindow) {
|
getter_AddRefs(browserWindow));
|
||||||
|
if (NS_WARN_IF(NS_FAILED(rv)) || !browserWindow) {
|
||||||
// It is possible to be running without a browser window on Mac OS, so
|
// It is possible to be running without a browser window on Mac OS, so
|
||||||
// we need to open a new chrome window.
|
// we need to open a new chrome window.
|
||||||
// TODO(catalinb): open new chrome window. Bug 1218080
|
// TODO(catalinb): open new chrome window. Bug 1218080
|
||||||
|
@ -191,15 +191,3 @@ interface nsIWindowMediator: nsISupports
|
|||||||
*/
|
*/
|
||||||
void removeListener(in nsIWindowMediatorListener aListener);
|
void removeListener(in nsIWindowMediatorListener aListener);
|
||||||
};
|
};
|
||||||
|
|
||||||
// XXXcatalinb: This should be merged to nsIWindowMediator. Using this
|
|
||||||
// to avoid UUID change in aurora.
|
|
||||||
[scriptable, uuid(88b54988-7f3c-40d2-a625-7e42a9c196c2)]
|
|
||||||
interface nsIWindowMediator_44 : nsIWindowMediator
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Same as getMostRecentWindow, but ignores private browsing
|
|
||||||
* windows.
|
|
||||||
*/
|
|
||||||
nsIDOMWindow getMostRecentNonPBWindow(in wstring aWindowType);
|
|
||||||
};
|
|
||||||
|
@ -275,7 +275,7 @@ nsWindowMediator::GetMostRecentWindow(const char16_t* inType, nsIDOMWindow** out
|
|||||||
|
|
||||||
// Find the most window with the highest time stamp that matches
|
// Find the most window with the highest time stamp that matches
|
||||||
// the requested type
|
// the requested type
|
||||||
nsWindowInfo* info = MostRecentWindowInfo(inType, false);
|
nsWindowInfo *info = MostRecentWindowInfo(inType);
|
||||||
if (info && info->mWindow) {
|
if (info && info->mWindow) {
|
||||||
nsCOMPtr<nsIDOMWindow> DOMWindow;
|
nsCOMPtr<nsIDOMWindow> DOMWindow;
|
||||||
if (NS_SUCCEEDED(GetDOMWindow(info->mWindow, DOMWindow))) {
|
if (NS_SUCCEEDED(GetDOMWindow(info->mWindow, DOMWindow))) {
|
||||||
@ -289,66 +289,31 @@ nsWindowMediator::GetMostRecentWindow(const char16_t* inType, nsIDOMWindow** out
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsWindowMediator::GetMostRecentNonPBWindow(const char16_t* aType, nsIDOMWindow** aWindow)
|
|
||||||
{
|
|
||||||
MOZ_RELEASE_ASSERT(NS_IsMainThread());
|
|
||||||
NS_ENSURE_ARG_POINTER(aWindow);
|
|
||||||
*aWindow = nullptr;
|
|
||||||
|
|
||||||
nsWindowInfo *info = MostRecentWindowInfo(aType, true);
|
|
||||||
nsCOMPtr<nsIDOMWindow> domWindow;
|
|
||||||
if (info && info->mWindow) {
|
|
||||||
GetDOMWindow(info->mWindow, domWindow);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!domWindow) {
|
|
||||||
return NS_ERROR_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
domWindow.forget(aWindow);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsWindowInfo*
|
nsWindowInfo*
|
||||||
nsWindowMediator::MostRecentWindowInfo(const char16_t* inType, bool aSkipPrivateBrowsing)
|
nsWindowMediator::MostRecentWindowInfo(const char16_t* inType)
|
||||||
{
|
{
|
||||||
MOZ_ASSERT(XRE_IsParentProcess());
|
|
||||||
|
|
||||||
int32_t lastTimeStamp = -1;
|
int32_t lastTimeStamp = -1;
|
||||||
nsAutoString typeString(inType);
|
nsAutoString typeString(inType);
|
||||||
bool allWindows = !inType || typeString.IsEmpty();
|
bool allWindows = !inType || typeString.IsEmpty();
|
||||||
|
|
||||||
// Find the most recent window with the highest time stamp that matches
|
// Find the most window with the highest time stamp that matches
|
||||||
// the requested type and has the correct browsing mode.
|
// the requested type
|
||||||
nsWindowInfo* searchInfo = mOldestWindow;
|
nsWindowInfo *searchInfo,
|
||||||
nsWindowInfo* listEnd = nullptr;
|
*listEnd,
|
||||||
nsWindowInfo* foundInfo = nullptr;
|
*foundInfo = nullptr;
|
||||||
for (; searchInfo != listEnd; searchInfo = searchInfo->mYounger) {
|
|
||||||
|
searchInfo = mOldestWindow;
|
||||||
|
listEnd = nullptr;
|
||||||
|
while (searchInfo != listEnd) {
|
||||||
|
if ((allWindows || searchInfo->TypeEquals(typeString)) &&
|
||||||
|
searchInfo->mTimeStamp >= lastTimeStamp) {
|
||||||
|
|
||||||
|
foundInfo = searchInfo;
|
||||||
|
lastTimeStamp = searchInfo->mTimeStamp;
|
||||||
|
}
|
||||||
|
searchInfo = searchInfo->mYounger;
|
||||||
listEnd = mOldestWindow;
|
listEnd = mOldestWindow;
|
||||||
|
|
||||||
if (!allWindows && !searchInfo->TypeEquals(typeString)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (searchInfo->mTimeStamp < lastTimeStamp) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (!searchInfo->mWindow) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (aSkipPrivateBrowsing) {
|
|
||||||
nsCOMPtr<nsIDocShell> docShell;
|
|
||||||
searchInfo->mWindow->GetDocShell(getter_AddRefs(docShell));
|
|
||||||
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
|
|
||||||
if (!loadContext || loadContext->UsePrivateBrowsing()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foundInfo = searchInfo;
|
|
||||||
lastTimeStamp = searchInfo->mTimeStamp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return foundInfo;
|
return foundInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -776,7 +741,6 @@ nsWindowMediator::SortZOrderBackToFront()
|
|||||||
}
|
}
|
||||||
|
|
||||||
NS_IMPL_ISUPPORTS(nsWindowMediator,
|
NS_IMPL_ISUPPORTS(nsWindowMediator,
|
||||||
nsIWindowMediator_44,
|
|
||||||
nsIWindowMediator,
|
nsIWindowMediator,
|
||||||
nsIObserver,
|
nsIObserver,
|
||||||
nsISupportsWeakReference)
|
nsISupportsWeakReference)
|
||||||
|
@ -25,7 +25,7 @@ class nsIWindowMediatorListener;
|
|||||||
struct nsWindowInfo;
|
struct nsWindowInfo;
|
||||||
|
|
||||||
class nsWindowMediator :
|
class nsWindowMediator :
|
||||||
public nsIWindowMediator_44,
|
public nsIWindowMediator,
|
||||||
public nsIObserver,
|
public nsIObserver,
|
||||||
public nsSupportsWeakReference
|
public nsSupportsWeakReference
|
||||||
{
|
{
|
||||||
@ -47,7 +47,6 @@ public:
|
|||||||
|
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
NS_DECL_NSIWINDOWMEDIATOR
|
NS_DECL_NSIWINDOWMEDIATOR
|
||||||
NS_DECL_NSIWINDOWMEDIATOR_44
|
|
||||||
NS_DECL_NSIOBSERVER
|
NS_DECL_NSIOBSERVER
|
||||||
|
|
||||||
static nsresult GetDOMWindow(nsIXULWindow* inWindow,
|
static nsresult GetDOMWindow(nsIXULWindow* inWindow,
|
||||||
@ -56,8 +55,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
int32_t AddEnumerator(nsAppShellWindowEnumerator* inEnumerator);
|
int32_t AddEnumerator(nsAppShellWindowEnumerator* inEnumerator);
|
||||||
int32_t RemoveEnumerator(nsAppShellWindowEnumerator* inEnumerator);
|
int32_t RemoveEnumerator(nsAppShellWindowEnumerator* inEnumerator);
|
||||||
nsWindowInfo* MostRecentWindowInfo(const char16_t* inType,
|
nsWindowInfo *MostRecentWindowInfo(const char16_t* inType);
|
||||||
bool aSkipPrivateBrowsing = false);
|
|
||||||
|
|
||||||
nsresult UnregisterWindow(nsWindowInfo *inInfo);
|
nsresult UnregisterWindow(nsWindowInfo *inInfo);
|
||||||
nsWindowInfo *GetInfoFor(nsIXULWindow *aWindow);
|
nsWindowInfo *GetInfoFor(nsIXULWindow *aWindow);
|
||||||
|
Loading…
Reference in New Issue
Block a user