mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 06:11:37 +00:00
b=91290 fix for printing regression test. r=karnaze sr=waterson
This commit is contained in:
parent
f1bb4efbfa
commit
6c20fd47b1
@ -309,6 +309,31 @@ void
|
||||
nsWebCrawler::LoadNextURLCallback(nsITimer *aTimer, void *aClosure)
|
||||
{
|
||||
nsWebCrawler* self = (nsWebCrawler*) aClosure;
|
||||
|
||||
// if we are doing printing regression tests, check to see
|
||||
// if we can print (a previous job is not printing)
|
||||
if (self->mPrinterTestType > 0) {
|
||||
nsCOMPtr<nsIWebShell> webshell;
|
||||
self->mBrowser->GetWebShell(*getter_AddRefs(webshell));
|
||||
if (webshell){
|
||||
nsCOMPtr <nsIContentViewer> viewer;
|
||||
nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(webshell));
|
||||
docShell->GetContentViewer(getter_AddRefs(viewer));
|
||||
if (viewer){
|
||||
nsCOMPtr<nsIContentViewerFile> viewerFile = do_QueryInterface(viewer);
|
||||
if (viewerFile) {
|
||||
PRBool printable;
|
||||
viewerFile->GetPrintable(&printable);
|
||||
if (PR_TRUE !=printable){
|
||||
self->mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||
self->mTimer->Init(LoadNextURLCallback, self, self->mDelay);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
self->DumpRegressionData();
|
||||
self->LoadNextURL(PR_FALSE);
|
||||
}
|
||||
@ -420,6 +445,12 @@ nsWebCrawler::OnStateChange(nsIWebProgress* aWebProgress,
|
||||
}
|
||||
|
||||
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
||||
if(mPrinterTestType>0){
|
||||
mDelay = 5000; // printing needs more time to load, so give it plenty
|
||||
} else {
|
||||
mDelay = 200;
|
||||
}
|
||||
|
||||
if ((0 < mQueuedLoadURLs) || (0 < mPendingURLs.Count())) {
|
||||
mTimer->Init(LoadNextURLCallback, this, mDelay);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user