From e97a493be336eb0e731a04ba2d46fcb0add8fe11 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Thu, 9 May 2002 22:02:44 +0000 Subject: [PATCH] making a few adjustments to the APIs before the freeze Bug 143248 r=conrad sr=attinasi git-svn-id: svn://10.0.0.236/trunk@121197 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsIPrintProgress.idl | 7 +++++-- mozilla/content/base/src/nsDocumentViewer.cpp | 5 +++-- .../browser/webBrowser/nsIPrintingPrompt.idl | 6 +++++- .../browser/webBrowser/nsIPrintingPromptService.idl | 6 +++++- .../browser/webBrowser/nsIWebBrowserPrint.idl | 11 ++++++++--- .../components/printingui/src/mac/nsPrintProgress.cpp | 6 ++++++ .../printingui/src/mac/nsPrintingPromptService.cpp | 1 + .../printingui/src/mac/nsPrintingPromptServiceX.cpp | 1 + .../components/printingui/src/os2/nsPrintProgress.cpp | 6 ++++++ .../printingui/src/os2/nsPrintingPromptService.cpp | 3 ++- .../printingui/src/unixshared/nsPrintProgress.cpp | 6 ++++++ .../src/unixshared/nsPrintingPromptService.cpp | 3 ++- .../components/printingui/src/win/nsPrintProgress.cpp | 6 ++++++ .../printingui/src/win/nsPrintingPromptService.cpp | 1 + .../components/windowwatcher/src/nsPrintingPrompt.cpp | 4 ++-- mozilla/embedding/tests/mfcembed/BrowserView.cpp | 2 +- mozilla/layout/base/nsDocumentViewer.cpp | 5 +++-- mozilla/layout/printing/nsIPrintProgress.idl | 7 +++++-- mozilla/modules/plugin/base/src/nsPluginViewer.cpp | 3 ++- mozilla/xpfe/browser/resources/content/browser.js | 2 +- 20 files changed, 71 insertions(+), 20 deletions(-) diff --git a/mozilla/content/base/public/nsIPrintProgress.idl b/mozilla/content/base/public/nsIPrintProgress.idl index d4b4374084a..b79c998385b 100644 --- a/mozilla/content/base/public/nsIPrintProgress.idl +++ b/mozilla/content/base/public/nsIPrintProgress.idl @@ -37,12 +37,11 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" -#include "domstubs.idl" -#include "nsIPrompt.idl" #include "nsIWebProgressListener.idl" interface nsIDOMWindowInternal; interface nsIObserver; +interface nsIPrompt; [scriptable, uuid(7E46BC35-FB7D-4b45-AB35-82FD61015380)] interface nsIPrintProgress: nsIWebProgressListener { @@ -65,6 +64,10 @@ interface nsIPrintProgress: nsIWebProgressListener { /* Unregister a Web Progress Listener */ void unregisterListener(in nsIWebProgressListener listener); + /* This method is called after the dialog that shows the progress has been shown + */ + void doneIniting(); + /* Retrive the prompter, needed to display modal dialog on top of progress dialog */ nsIPrompt getPrompter(); diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 375ce99689f..9b5506770db 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -6340,7 +6340,8 @@ void DocumentViewerImpl::CheckForHiddenFrameSetFrames() * PrintPreview: See the design spec that is attached to Bug 107562 */ NS_IMETHODIMP -DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings) +DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings, + nsIWebProgressListener* aWebProgressListener) { if (!mPresShell) { // A frame that's not displayed can't be printed! @@ -6702,7 +6703,7 @@ DocumentViewerImpl::DoPrintProgress(PRBool aIsForPrinting) // If we don't get a service, that's ok, then just don't show progress if (mPrt->mShowProgressDialog) { PRBool notifyOnOpen; - nsresult rv = printPromptService->ShowProgress(domWin, this, mPrt->mPrintSettings, nsnull, getter_AddRefs(mPrt->mPrintProgressListener), getter_AddRefs(mPrt->mPrintProgressParams), ¬ifyOnOpen); + nsresult rv = printPromptService->ShowProgress(domWin, this, mPrt->mPrintSettings, nsnull, PR_TRUE, getter_AddRefs(mPrt->mPrintProgressListener), getter_AddRefs(mPrt->mPrintProgressParams), ¬ifyOnOpen); if (NS_SUCCEEDED(rv)) { mPrt->mShowProgressDialog = mPrt->mPrintProgressListener != nsnull && mPrt->mPrintProgressParams != nsnull; diff --git a/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl b/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl index 05deac8c2d8..c4469ccc53e 100644 --- a/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl +++ b/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl @@ -156,14 +156,18 @@ interface nsIPrintingPrompt : nsISupports * @param webBrowserPrint - represents the document to be printed * @param printSettings - PrintSettings for print "job" * @param openDialogObserver - an observer that will be notifed when the dialog is opened + * @param isForPrinting - true - for printing, false for print preview * @param webProgressListener - additional listener can be registered for progress notifications * @param printProgressParams - parameter object for passing progress state * @param notifyOnOpen - this indicates that the observer will be notified when the progress - * dialog has been opened + * dialog has been opened. If false is returned it means the observer + * (usually the caller) shouldn't wait + * For Print Preview Progress there is intermediate progress */ void showProgress(in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, + in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); diff --git a/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl b/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl index 9f62b4614fb..e49bc01395e 100644 --- a/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl +++ b/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl @@ -153,15 +153,19 @@ interface nsIPrintingPromptService : nsISupports * @param webBrowserPrint - represents the document to be printed * @param printSettings - PrintSettings for print "job" * @param openDialogObserver - an observer that will be notifed when the dialog is opened + * @param isForPrinting - true - for printing, false for print preview * @param webProgressListener - additional listener can be registered for progress notifications * @param printProgressParams - parameter object for passing progress state * @param notifyOnOpen - this indicates that the observer will be notified when the progress - * dialog has been opened + * dialog has been opened. If false is returned it means the observer + * (usually the caller) shouldn't wait + * For Print Preview Progress there is intermediate progress */ void showProgress(in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, + in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); diff --git a/mozilla/embedding/browser/webBrowser/nsIWebBrowserPrint.idl b/mozilla/embedding/browser/webBrowser/nsIWebBrowserPrint.idl index 1ffedd604d1..7a654b7238e 100644 --- a/mozilla/embedding/browser/webBrowser/nsIWebBrowserPrint.idl +++ b/mozilla/embedding/browser/webBrowser/nsIWebBrowserPrint.idl @@ -18,6 +18,7 @@ * * Contributor(s): * Don Cone + * Rod Spears */ #include "nsISupports.idl" @@ -27,7 +28,9 @@ interface nsIPrintSettings; interface nsIWebProgressListener; /** - * The nsIWebBrowserPrint + * nsIWebBrowserPrint corresponds to the main interface + * for printing an embedded Gecko web browser window/document + * */ [scriptable, uuid(9A7CA4B0-FBBA-11d4-A869-00105A183419)] interface nsIWebBrowserPrint : nsISupports @@ -174,15 +177,17 @@ interface nsIWebBrowserPrint : nsISupports * @return void */ void print(in nsIPrintSettings aThePrintSettings, - in nsIWebProgressListener aWPListener); + in nsIWebProgressListener aWPListener); /** * Print Preview the specified DOM window * * aThePrintOptions - Printer Settings for the print preview + * nsIWebProgressListener - is updated during the printpreview * @return void */ - void printPreview(in nsIPrintSettings aThePrintSettings); + void printPreview(in nsIPrintSettings aThePrintSettings, + in nsIWebProgressListener aWPListener); /** * Print Preview - Navigates within the window diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp index e85ca0b25eb..982f0ba38ac 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp @@ -183,6 +183,12 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } +/* void doneIniting (); */ +NS_IMETHODIMP nsPrintProgress::DoneIniting() +{ + return NS_OK; +} + /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus) { diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp index b64115047f1..f520531e8f0 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp @@ -417,6 +417,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null nsIPrintSettings* printSettings, // ok to be null nsIObserver* openDialogObserver, // ok to be null + PRBool isForPrinting, nsIWebProgressListener** webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp index e740cd46112..afa8efbd250 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp @@ -266,6 +266,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null nsIPrintSettings* printSettings, // ok to be null nsIObserver* openDialogObserver, // ok to be null + PRBool isForPrinting, nsIWebProgressListener** webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp index e85ca0b25eb..982f0ba38ac 100644 --- a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp @@ -183,6 +183,12 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } +/* void doneIniting (); */ +NS_IMETHODIMP nsPrintProgress::DoneIniting() +{ + return NS_OK; +} + /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus) { diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index f3866a792db..f2077a414a7 100644 --- a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp @@ -131,12 +131,13 @@ nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrin return DoDialog(parent, block, webBrowserPrint, printSettings, kPrintDialogURL); } -/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, out nsIWebProgressListener webProgressListener); */ +/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); */ NS_IMETHODIMP nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null nsIPrintSettings* printSettings, // ok to be null nsIObserver* openDialogObserver, // ok to be null + PRBool isForPrinting, nsIWebProgressListener** webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp index e85ca0b25eb..982f0ba38ac 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp @@ -183,6 +183,12 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } +/* void doneIniting (); */ +NS_IMETHODIMP nsPrintProgress::DoneIniting() +{ + return NS_OK; +} + /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus) { diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index 3bb65f580eb..120fc8d84ae 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -126,12 +126,13 @@ nsPrintingPromptService::ShowPrintDialog(nsIDOMWindow *parent, nsIWebBrowserPrin return DoDialog(parent, block, webBrowserPrint, printSettings, kPrintDialogURL); } -/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, out nsIWebProgressListener webProgressListener); */ +/* void showProgress (in nsIDOMWindow parent, in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, in nsIObserver openDialogObserver, in boolean isForPrinting, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams, out boolean notifyOnOpen); */ NS_IMETHODIMP nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null nsIPrintSettings* printSettings, // ok to be null nsIObserver* openDialogObserver, // ok to be null + PRBool isForPrinting, nsIWebProgressListener** webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp index ee53904b39b..32fc0e7fde9 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp @@ -184,6 +184,12 @@ NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listen return NS_OK; } +/* void doneIniting (); */ +NS_IMETHODIMP nsPrintProgress::DoneIniting() +{ + return NS_OK; +} + /* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */ NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus) { diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index a1983ed28ee..9b4c6c98a13 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -192,6 +192,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, nsIWebBrowserPrint* webBrowserPrint, // ok to be null nsIPrintSettings* printSettings, // ok to be null nsIObserver* openDialogObserver, // ok to be null + PRBool isForPrinting, nsIWebProgressListener** webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) diff --git a/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp b/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp index a36d8eaa34e..cbacf23f11b 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp @@ -91,9 +91,9 @@ nsPrintingPrompt::ShowPrintDialog(nsIWebBrowserPrint *webBrowserPrint, nsIPrintS /* void showProgress (in nsIWebBrowserPrint webBrowserPrint, in nsIPrintSettings printSettings, out nsIWebProgressListener webProgressListener, out nsIPrintProgressParams printProgressParams); */ NS_IMETHODIMP -nsPrintingPrompt::ShowProgress(nsIWebBrowserPrint *webBrowserPrint, nsIPrintSettings *printSettings, nsIObserver *openDialogObserver, nsIWebProgressListener **webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) +nsPrintingPrompt::ShowProgress(nsIWebBrowserPrint *webBrowserPrint, nsIPrintSettings *printSettings, nsIObserver *openDialogObserver, PRBool isForPrinting, nsIWebProgressListener **webProgressListener, nsIPrintProgressParams** printProgressParams, PRBool* notifyOnOpen) { - return mPromptService->ShowProgress(mParent, webBrowserPrint, printSettings, openDialogObserver, webProgressListener, printProgressParams, notifyOnOpen); + return mPromptService->ShowProgress(mParent, webBrowserPrint, printSettings, openDialogObserver, isForPrinting, webProgressListener, printProgressParams, notifyOnOpen); } /* void showPageSetup (in nsIPrintSettings printSettings); */ diff --git a/mozilla/embedding/tests/mfcembed/BrowserView.cpp b/mozilla/embedding/tests/mfcembed/BrowserView.cpp index 66d860ef0b9..9f47b0e0f9f 100644 --- a/mozilla/embedding/tests/mfcembed/BrowserView.cpp +++ b/mozilla/embedding/tests/mfcembed/BrowserView.cpp @@ -1014,7 +1014,7 @@ void CBrowserView::OnFilePrintPreview() nsCOMPtr print(do_GetInterface(mWebBrowser)); if(print) { - print->PrintPreview(m_PrintSettings); + print->PrintPreview(m_PrintSettings, nsnull); } } diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 375ce99689f..9b5506770db 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -6340,7 +6340,8 @@ void DocumentViewerImpl::CheckForHiddenFrameSetFrames() * PrintPreview: See the design spec that is attached to Bug 107562 */ NS_IMETHODIMP -DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings) +DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings, + nsIWebProgressListener* aWebProgressListener) { if (!mPresShell) { // A frame that's not displayed can't be printed! @@ -6702,7 +6703,7 @@ DocumentViewerImpl::DoPrintProgress(PRBool aIsForPrinting) // If we don't get a service, that's ok, then just don't show progress if (mPrt->mShowProgressDialog) { PRBool notifyOnOpen; - nsresult rv = printPromptService->ShowProgress(domWin, this, mPrt->mPrintSettings, nsnull, getter_AddRefs(mPrt->mPrintProgressListener), getter_AddRefs(mPrt->mPrintProgressParams), ¬ifyOnOpen); + nsresult rv = printPromptService->ShowProgress(domWin, this, mPrt->mPrintSettings, nsnull, PR_TRUE, getter_AddRefs(mPrt->mPrintProgressListener), getter_AddRefs(mPrt->mPrintProgressParams), ¬ifyOnOpen); if (NS_SUCCEEDED(rv)) { mPrt->mShowProgressDialog = mPrt->mPrintProgressListener != nsnull && mPrt->mPrintProgressParams != nsnull; diff --git a/mozilla/layout/printing/nsIPrintProgress.idl b/mozilla/layout/printing/nsIPrintProgress.idl index d4b4374084a..b79c998385b 100644 --- a/mozilla/layout/printing/nsIPrintProgress.idl +++ b/mozilla/layout/printing/nsIPrintProgress.idl @@ -37,12 +37,11 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" -#include "domstubs.idl" -#include "nsIPrompt.idl" #include "nsIWebProgressListener.idl" interface nsIDOMWindowInternal; interface nsIObserver; +interface nsIPrompt; [scriptable, uuid(7E46BC35-FB7D-4b45-AB35-82FD61015380)] interface nsIPrintProgress: nsIWebProgressListener { @@ -65,6 +64,10 @@ interface nsIPrintProgress: nsIWebProgressListener { /* Unregister a Web Progress Listener */ void unregisterListener(in nsIWebProgressListener listener); + /* This method is called after the dialog that shows the progress has been shown + */ + void doneIniting(); + /* Retrive the prompter, needed to display modal dialog on top of progress dialog */ nsIPrompt getPrompter(); diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index a7ffac3ddf0..efd59f9d264 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -871,7 +871,8 @@ PluginViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetting /* void printPreview (in nsIPrintSettings aThePrintSettings); */ NS_IMETHODIMP -PluginViewerImpl::PrintPreview(nsIPrintSettings *aThePrintSettings) +PluginViewerImpl::PrintPreview(nsIPrintSettings *aThePrintSettings, + nsIWebProgressListener* aWebProgressListener) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/mozilla/xpfe/browser/resources/content/browser.js b/mozilla/xpfe/browser/resources/content/browser.js index c08c14d6f61..3d412b2365c 100644 --- a/mozilla/xpfe/browser/resources/content/browser.js +++ b/mozilla/xpfe/browser/resources/content/browser.js @@ -285,7 +285,7 @@ function BrowserPrintSetup() webBrowserPrint.savePrintSettingsToPrefs(gPrintSettings, false, gPrintSettings.kInitSaveNativeData); } if (webBrowserPrint.doingPrintPreview) { - webBrowserPrint.printPreview(gPrintSettings); + webBrowserPrint.printPreview(gPrintSettings, null); } } }