wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 77c1f23afc1c (bug 933483) for mochitest-bc failures.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-12-02 20:31:18 -05:00
parent c489b1733e
commit fd1c979402
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/base/src/nsDocument.cpp
View File

@ -8490,10 +8490,7 @@ FireOrClearDelayedEvents(nsTArray<nsCOMPtr<nsIDocument> >& aDocuments,
return; return;
for (uint32_t i = 0; i < aDocuments.Length(); ++i) { for (uint32_t i = 0; i < aDocuments.Length(); ++i) {
// NB: Don't bother trying to fire delayed events on documents that were if (!aDocuments[i]->EventHandlingSuppressed()) {
// closed before this event ran.
if (!aDocuments[i]->EventHandlingSuppressed() &&
aDocuments[i]->IsActive()) {
fm->FireDelayedEvents(aDocuments[i]); fm->FireDelayedEvents(aDocuments[i]);
nsCOMPtr<nsIPresShell> shell = aDocuments[i]->GetShell(); nsCOMPtr<nsIPresShell> shell = aDocuments[i]->GetShell();
if (shell) { if (shell) {

7
dom/base/nsGlobalWindow.cpp
View File

@ -8185,8 +8185,10 @@ nsGlobalWindow::EnterModalState()
NS_ASSERTION(!mSuspendedDoc, "Shouldn't have mSuspendedDoc here!"); NS_ASSERTION(!mSuspendedDoc, "Shouldn't have mSuspendedDoc here!");
mSuspendedDoc = topWin->GetExtantDoc(); mSuspendedDoc = topWin->GetExtantDoc();
if (mSuspendedDoc) { if (mSuspendedDoc && mSuspendedDoc->EventHandlingSuppressed()) {
mSuspendedDoc->SuppressEventHandling(); mSuspendedDoc->SuppressEventHandling();
} else {
mSuspendedDoc = nullptr;
} }
} }
topWin->mModalStateDepth++; topWin->mModalStateDepth++;
@ -8200,8 +8202,7 @@ nsGlobalWindow::RunPendingTimeoutsRecursive(nsGlobalWindow *aTopWindow,
nsGlobalWindow *inner; nsGlobalWindow *inner;
// Return early if we're frozen or have no inner window. // Return early if we're frozen or have no inner window.
if (aWindow->IsClosedOrClosing() || if (!(inner = aWindow->GetCurrentInnerWindowInternal()) ||
!(inner = aWindow->GetCurrentInnerWindowInternal()) ||
inner->IsFrozen()) { inner->IsFrozen()) {
return; return;
} }

1
dom/tests/mochitest/bugs/test_bug61098.html
View File

@ -21,6 +21,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=61098
<script class="testbody" type="text/javascript"> <script class="testbody" type="text/javascript">
/** Test for Bug 61098 **/ /** Test for Bug 61098 **/
SimpleTest.expectAssertions(8);
SimpleTest.waitForExplicitFinish(); SimpleTest.waitForExplicitFinish();
var mockPromptServiceRegisterer, mockPromptFactoryRegisterer; var mockPromptServiceRegisterer, mockPromptFactoryRegisterer;