From 8eb9390ceaccc7b51f720a244e2bc63ac89cbbfe Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 14 Mar 2013 12:02:28 -0700
Subject: [PATCH] Bug 671976 - Fix print preview asserts (r=smaug)

---
 .../chrome/printpreview_bug396024_helper.xul  |  4 ++--
 .../chrome/printpreview_bug482976_helper.xul  |  4 ++--
 .../base/tests/chrome/printpreview_helper.xul |  4 ++--
 .../base/tests/chrome/test_printpreview.xul   | 22 -------------------
 .../chrome/test_printpreview_bug396024.xul    | 22 -------------------
 .../chrome/test_printpreview_bug482976.xul    | 21 ------------------
 .../test/test_bug536567_perwindowpb.html      |  5 -----
 layout/printing/nsPrintEngine.cpp             |  6 +++++
 8 files changed, 12 insertions(+), 76 deletions(-)

diff --git a/layout/base/tests/chrome/printpreview_bug396024_helper.xul b/layout/base/tests/chrome/printpreview_bug396024_helper.xul
index 368e55114e1a..8fe2609f5bf8 100644
--- a/layout/base/tests/chrome/printpreview_bug396024_helper.xul
+++ b/layout/base/tests/chrome/printpreview_bug396024_helper.xul
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396024
 var is = window.opener.wrappedJSObject.is;
 var ok = window.opener.wrappedJSObject.ok;
 var todo = window.opener.wrappedJSObject.todo;
-var parentFinish = window.opener.wrappedJSObject.parentFinish;
+var SimpleTest = window.opener.wrappedJSObject.SimpleTest;
 var gWbp;
 function printpreview() {
   gWbp = window.frames[1].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
@@ -49,7 +49,7 @@ function exitprintpreview() {
 }
 
 function finish() {
-  parentFinish();
+  SimpleTest.finish();
   window.close();
 }
 
diff --git a/layout/base/tests/chrome/printpreview_bug482976_helper.xul b/layout/base/tests/chrome/printpreview_bug482976_helper.xul
index be3e63fd1326..34c2d658ec74 100644
--- a/layout/base/tests/chrome/printpreview_bug482976_helper.xul
+++ b/layout/base/tests/chrome/printpreview_bug482976_helper.xul
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482976
 var is = window.opener.wrappedJSObject.is;
 var ok = window.opener.wrappedJSObject.ok;
 var todo = window.opener.wrappedJSObject.todo;
-var parentFinish = window.opener.wrappedJSObject.parentFinish;
+var SimpleTest = window.opener.wrappedJSObject.SimpleTest;
 var gWbp;
 function printpreview() {
   gWbp = window.frames[1].QueryInterface(Components.interfaces.nsIInterfaceRequestor)
@@ -49,7 +49,7 @@ function exitprintpreview() {
 }
 
 function finish() {
-  parentFinish();
+  SimpleTest.finish();
   window.close();
 }
 
diff --git a/layout/base/tests/chrome/printpreview_helper.xul b/layout/base/tests/chrome/printpreview_helper.xul
index 436336fd6c53..3ad11f5bc31a 100644
--- a/layout/base/tests/chrome/printpreview_helper.xul
+++ b/layout/base/tests/chrome/printpreview_helper.xul
@@ -12,7 +12,7 @@ var is = window.opener.wrappedJSObject.is;
 var isnot = window.opener.wrappedJSObject.isnot;
 var ok = window.opener.wrappedJSObject.ok;
 var todo = window.opener.wrappedJSObject.todo;
-var parentFinish = window.opener.wrappedJSObject.parentFinish;
+var SimpleTest = window.opener.wrappedJSObject.SimpleTest;
 var gWbp;
 var ctx1;
 var ctx2;
@@ -66,7 +66,7 @@ function exitprintpreview() {
 }
 
 function finish() {
-  parentFinish();
+  SimpleTest.finish();
   window.close();
 }
 
diff --git a/layout/base/tests/chrome/test_printpreview.xul b/layout/base/tests/chrome/test_printpreview.xul
index 64a2365ab042..6a63791f228c 100644
--- a/layout/base/tests/chrome/test_printpreview.xul
+++ b/layout/base/tests/chrome/test_printpreview.xul
@@ -10,28 +10,6 @@
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(1); // bug 671976
-} else if (navigator.platform.startsWith("Win")) {
-  // reliable 1 on Win7, but not on XP
-  SimpleTest.expectAssertions(0, 1); // bug 671976
-}
-
-function parentFinish() {
-  // This is called while the helper window is still open.  Call
-  // doGC after it closes.
-  setTimeout(doGC, 0);
-}
-function doGC() {
-  // Garbage collecting the windows created in this test can cause
-  // assertions, so GC now to blame those assertions to this test.
-  // ("Destroying a currently-showing document", bug 671976)
-  SpecialPowers.gc();
-  setTimeout(doFinish, 0);
-}
-function doFinish() {
-  SimpleTest.finish();
-}
 SimpleTest.waitForExplicitFinish();
 window.open("printpreview_helper.xul", "printpreview", "chrome,width=100,height=100");
 ]]></script>
diff --git a/layout/base/tests/chrome/test_printpreview_bug396024.xul b/layout/base/tests/chrome/test_printpreview_bug396024.xul
index 651f494b1269..eb086d35a63d 100644
--- a/layout/base/tests/chrome/test_printpreview_bug396024.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug396024.xul
@@ -16,28 +16,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396024
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(2); // bug 671976
-} else if (navigator.platform.startsWith("Win")) {
-  // reliable 2 on Win7, but not on XP
-  SimpleTest.expectAssertions(0, 2); // bug 671976
-}
-
-function parentFinish() {
-  // This is called while the helper window is still open.  Call
-  // doGC after it closes.
-  setTimeout(doGC, 0);
-}
-function doGC() {
-  // Garbage collecting the windows created in this test can cause
-  // assertions, so GC now to blame those assertions to this test.
-  // ("Destroying a currently-showing document", bug 671976)
-  SpecialPowers.gc();
-  setTimeout(doFinish, 0);
-}
-function doFinish() {
-  SimpleTest.finish();
-}
 SimpleTest.waitForExplicitFinish();
 window.open("printpreview_bug396024_helper.xul", "bug396024", "chrome,width=100,height=100");
 ]]></script>
diff --git a/layout/base/tests/chrome/test_printpreview_bug482976.xul b/layout/base/tests/chrome/test_printpreview_bug482976.xul
index ff3181c62a20..52918d5ba0b6 100644
--- a/layout/base/tests/chrome/test_printpreview_bug482976.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug482976.xul
@@ -16,28 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482976
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
-if (navigator.platform.startsWith("Linux")) {
-  SimpleTest.expectAssertions(1); // bug 671976
-} else if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 2); // bug 671976
-}
-
 SimpleTest.waitForExplicitFinish();
-function parentFinish() {
-  // This is called while the helper window is still open.  Call
-  // doGC after it closes.
-  setTimeout(doGC, 0);
-}
-function doGC() {
-  // Garbage collecting the windows created in this test can cause
-  // assertions, so GC now to blame those assertions to this test.
-  // ("Destroying a currently-showing document", bug 671976)
-  SpecialPowers.gc();
-  setTimeout(doFinish, 0);
-}
-function doFinish() {
-  SimpleTest.finish();
-}
 window.open("printpreview_bug482976_helper.xul", "bug482976", "chrome,width=100,height=100");
 ]]></script>
 </window>
diff --git a/layout/forms/test/test_bug536567_perwindowpb.html b/layout/forms/test/test_bug536567_perwindowpb.html
index 61e2b04f9083..fc59071a5511 100644
--- a/layout/forms/test/test_bug536567_perwindowpb.html
+++ b/layout/forms/test/test_bug536567_perwindowpb.html
@@ -14,11 +14,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=536567
 <p id="display"></p>
 <pre id="test">
 <script type="application/javascript">
-
-if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1); // bug 671976 assertions leak to this test on Windows
-}
-
 /** Test for Bug 536567 **/
 
 const Cc = Components.classes;
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 029bfce56c3b..11dea7e6d1a6 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -530,6 +530,12 @@ nsPrintEngine::DoCommonPrint(bool                    aIsPrintPreview,
   NS_ENSURE_SUCCESS(rv, rv);
 
   {
+    nsCOMPtr<nsIContentViewer> viewer;
+    webContainer->GetContentViewer(getter_AddRefs(viewer));
+    if (viewer && viewer->GetDocument() && viewer->GetDocument()->IsShowing()) {
+      viewer->GetDocument()->OnPageHide(false, nullptr);
+    }
+
     nsAutoScriptBlocker scriptBlocker;
     mPrt->mPrintObject = new nsPrintObject();
     NS_ENSURE_TRUE(mPrt->mPrintObject, NS_ERROR_OUT_OF_MEMORY);