--- a/layout/printing/nsPrintData.cpp
+++ b/layout/printing/nsPrintData.cpp
@@ -24,19 +24,19 @@ static mozilla::LazyLogModule gPrintingL
//---------------------------------------------------
//-- nsPrintData Class Impl
//---------------------------------------------------
nsPrintData::nsPrintData(ePrintDataType aType) :
mType(aType), mDebugFilePtr(nullptr), mPrintObject(nullptr), mSelectedPO(nullptr),
mPrintDocList(0), mIsIFrameSelected(false),
mIsParentAFrameSet(false), mOnStartSent(false),
mIsAborted(false), mPreparingForPrint(false), mDocWasToBeDestroyed(false),
- mShrinkToFit(false), mPrintFrameType(nsIPrintSettings::kFramesAsIs),
+ mShrinkToFit(false), mPrintFrameType(nsIPrintSettings::kFramesAsIs),
mNumPrintablePages(0), mNumPagesPrinted(0),
- mShrinkRatio(1.0), mOrigDCScale(1.0), mPPEventListeners(nullptr),
+ mShrinkRatio(1.0), mOrigDCScale(1.0), mPPEventListeners(nullptr),
mBrandName(nullptr)
{
MOZ_COUNT_CTOR(nsPrintData);
nsCOMPtr<nsIStringBundle> brandBundle;
nsCOMPtr<nsIStringBundleService> svc =
mozilla::services::GetStringBundleService();
if (svc) {
svc->CreateBundle( "chrome://branding/locale/brand.properties", getter_AddRefs( brandBundle ) );
@@ -71,17 +71,17 @@ nsPrintData::~nsPrintData()
bool isCancelled = false;
mPrintSettings->GetIsCancelled(&isCancelled);
nsresult rv = NS_OK;
if (mType == eIsPrinting) {
if (!isCancelled && !mIsAborted) {
rv = mPrintDC->EndDocument();
} else {
- rv = mPrintDC->AbortDocument();
+ rv = mPrintDC->AbortDocument();
}
if (NS_FAILED(rv)) {
// XXX nsPrintData::ShowPrintErrorDialog(rv);
}
}
}
delete mPrintObject;
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -132,17 +132,17 @@ using namespace mozilla::dom;
//-----------------------------------------------------
// PR LOGGING
#include "mozilla/Logging.h"
#ifdef DEBUG
// PR_LOGGING is force to always be on (even in release builds)
// but we only want some of it on,
-//#define EXTENDED_DEBUG_PRINTING
+//#define EXTENDED_DEBUG_PRINTING
#endif
#define DUMP_LAYOUT_LEVEL 9 // this turns on the dumping of each doucment's layout info
#ifndef PR_PL
static mozilla::LazyLogModule gPrintingLog("printing")
#define PR_PL(_p1) MOZ_LOG(gPrintingLog, mozilla::LogLevel::Debug, _p1);
@@ -184,17 +184,17 @@ public:
void Suppress()
{
if (mPrintEngine) {
mSuppressed = true;
mPrintEngine->TurnScriptingOn(false);
}
}
-
+
void Unsuppress()
{
if (mPrintEngine && mSuppressed) {
mPrintEngine->TurnScriptingOn(true);
}
mSuppressed = false;
}
@@ -255,17 +255,17 @@ void nsPrintEngine::DestroyPrintingData(
mPrt = nullptr;
}
//---------------------------------------------------------------------------------
//-- Section: Methods needed by the DocViewer
//---------------------------------------------------------------------------------
//--------------------------------------------------------
-nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint,
+nsresult nsPrintEngine::Initialize(nsIDocumentViewerPrint* aDocViewerPrint,
nsIDocShell* aContainer,
nsIDocument* aDocument,
float aScreenDPI,
FILE* aDebugFile)
{
NS_ENSURE_ARG_POINTER(aDocViewerPrint);
NS_ENSURE_ARG_POINTER(aContainer);
NS_ENSURE_ARG_POINTER(aDocument);
@@ -297,18 +297,18 @@ nsPrintEngine::Cancelled()
{
if (mPrt && mPrt->mPrintSettings) {
return mPrt->mPrintSettings->SetIsCancelled(true);
}
return NS_ERROR_FAILURE;
}
//-------------------------------------------------------
-// Install our event listeners on the document to prevent
-// some events from being processed while in PrintPreview
+// Install our event listeners on the document to prevent
+// some events from being processed while in PrintPreview
//
// No return code - if this fails, there isn't much we can do
void
nsPrintEngine::InstallPrintPreviewListener()
{
if (!mPrt->mPPEventListeners) {
nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mContainer);
if (!docShell) {
@@ -319,17 +319,17 @@ nsPrintEngine::InstallPrintPreviewListen
nsCOMPtr<EventTarget> target = win->GetFrameElementInternal();
mPrt->mPPEventListeners = new nsPrintPreviewListener(target);
mPrt->mPPEventListeners->AddListeners();
}
}
}
//----------------------------------------------------------------------
-nsresult
+nsresult
nsPrintEngine::GetSeqFrameAndCountPagesInternal(nsPrintObject* aPO,
nsIFrame*& aSeqFrame,
int32_t& aCount)
{
NS_ENSURE_ARG_POINTER(aPO);
// This is sometimes incorrectly called before the pres shell has been created
// (bug 1141756). MOZ_DIAGNOSTIC_ASSERT so we'll still see the crash in
@@ -614,17 +614,17 @@ nsPrintEngine::DoCommonPrint(bool
// ShowPrintDialog triggers an event loop which means we can't assume
// that the state of this->{anything} matches the state we've checked
// above. Including that a given {thing} is non null.
if (!mPrt) {
return NS_ERROR_FAILURE;
}
if (NS_SUCCEEDED(rv)) {
- // since we got the dialog and it worked then make sure we
+ // since we got the dialog and it worked then make sure we
// are telling GFX we want to print silent
printSilently = true;
if (mPrt->mPrintSettings && !aIsPrintPreview) {
// The user might have changed shrink-to-fit in the print dialog, so update our copy of its state
mPrt->mPrintSettings->GetShrinkToFit(&mPrt->mShrinkToFit);
// If we haven't already added the RemotePrintJob as a listener,
@@ -648,17 +648,17 @@ nsPrintEngine::DoCommonPrint(bool
// No dialog service available
rv = NS_ERROR_NOT_IMPLEMENTED;
}
} else {
// Call any code that requires a run of the event loop.
rv = mPrt->mPrintSettings->SetupSilentPrinting();
}
// Check explicitly for abort because it's expected
- if (rv == NS_ERROR_ABORT)
+ if (rv == NS_ERROR_ABORT)
return rv;
NS_ENSURE_SUCCESS(rv, rv);
}
rv = devspec->Init(nullptr, mPrt->mPrintSettings, aIsPrintPreview);
NS_ENSURE_SUCCESS(rv, rv);
mPrt->mPrintDC = new nsDeviceContext();
@@ -779,18 +779,18 @@ nsPrintEngine::Print(nsIPrintSettings*
nsCOMPtr<nsIDOMDocument> doc =
do_QueryInterface(mPrtPreview && mPrtPreview->mPrintObject ?
mPrtPreview->mPrintObject->mDocument : mDocument);
return CommonPrint(false, aPrintSettings, aWebProgressListener, doc);
}
NS_IMETHODIMP
-nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings,
- mozIDOMWindowProxy* aChildDOMWin,
+nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings,
+ mozIDOMWindowProxy* aChildDOMWin,
nsIWebProgressListener* aWebProgressListener)
{
// Get the DocShell and see if it is busy
// (We can't Print Preview this document if it is still busy)
nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
NS_ENSURE_STATE(docShell);
uint32_t busyFlags = nsIDocShell::BUSY_FLAGS_NONE;
@@ -817,67 +817,67 @@ NS_IMETHODIMP
nsPrintEngine::GetIsFramesetDocument(bool *aIsFramesetDocument)
{
nsCOMPtr<nsIDocShell> webContainer(do_QueryReferent(mContainer));
*aIsFramesetDocument = IsParentAFrameSet(webContainer);
return NS_OK;
}
//----------------------------------------------------------------------------------
-NS_IMETHODIMP
+NS_IMETHODIMP
nsPrintEngine::GetIsIFrameSelected(bool *aIsIFrameSelected)
{
*aIsIFrameSelected = false;
// Get the docshell for this documentviewer
nsCOMPtr<nsIDocShell> webContainer(do_QueryReferent(mContainer));
// Get the currently focused window
nsCOMPtr<nsPIDOMWindowOuter> currentFocusWin = FindFocusedDOMWindow();
if (currentFocusWin && webContainer) {
- // Get whether the doc contains a frameset
+ // Get whether the doc contains a frameset
// Also, check to see if the currently focus docshell
// is a child of this docshell
bool isParentFrameSet;
*aIsIFrameSelected = IsThereAnIFrameSelected(webContainer, currentFocusWin, isParentFrameSet);
}
return NS_OK;
}
//----------------------------------------------------------------------------------
-NS_IMETHODIMP
+NS_IMETHODIMP
nsPrintEngine::GetIsRangeSelection(bool *aIsRangeSelection)
{
- // Get the currently focused window
+ // Get the currently focused window
nsCOMPtr<nsPIDOMWindowOuter> currentFocusWin = FindFocusedDOMWindow();
*aIsRangeSelection = IsThereARangeSelection(currentFocusWin);
return NS_OK;
}
//----------------------------------------------------------------------------------
-NS_IMETHODIMP
+NS_IMETHODIMP
nsPrintEngine::GetIsFramesetFrameSelected(bool *aIsFramesetFrameSelected)
{
- // Get the currently focused window
+ // Get the currently focused window
nsCOMPtr<nsPIDOMWindowOuter> currentFocusWin = FindFocusedDOMWindow();
*aIsFramesetFrameSelected = currentFocusWin != nullptr;
return NS_OK;
}
//----------------------------------------------------------------------------------
NS_IMETHODIMP
nsPrintEngine::GetPrintPreviewNumPages(int32_t *aPrintPreviewNumPages)
{
NS_ENSURE_ARG_POINTER(aPrintPreviewNumPages);
nsPrintData* prt = nullptr;
nsIFrame* seqFrame = nullptr;
*aPrintPreviewNumPages = 0;
// When calling this function, the FinishPrintPreview() function might not
- // been called as there are still some
+ // been called as there are still some
if (mPrtPreview) {
prt = mPrtPreview.get();
} else {
prt = mPrt.get();
}
if ((!prt) ||
NS_FAILED(GetSeqFrameAndCountPagesInternal(prt->mPrintObject, seqFrame, *aPrintPreviewNumPages))) {
return NS_ERROR_FAILURE;
@@ -1019,42 +1019,42 @@ nsPrintEngine::CheckForPrinters(nsIPrint
}
//----------------------------------------------------------------------
// Set up to use the "pluggable" Print Progress Dialog
void
nsPrintEngine::ShowPrintProgress(bool aIsForPrinting, bool& aDoNotify)
{
// default to not notifying, that if something here goes wrong
- // or we aren't going to show the progress dialog we can straight into
+ // or we aren't going to show the progress dialog we can straight into
// reflowing the doc for printing.
aDoNotify = false;
// Assume we can't do progress and then see if we can
bool showProgresssDialog = false;
// if it is already being shown then don't bother to find out if it should be
// so skip this and leave mShowProgressDialog set to FALSE
if (!mProgressDialogIsShown) {
showProgresssDialog = Preferences::GetBool("print.show_print_progress");
}
// Turning off the showing of Print Progress in Prefs overrides
- // whether the calling PS desire to have it on or off, so only check PS if
+ // whether the calling PS desire to have it on or off, so only check PS if
// prefs says it's ok to be on.
if (showProgresssDialog) {
mPrt->mPrintSettings->GetShowPrintProgress(&showProgresssDialog);
}
// Now open the service to get the progress dialog
// If we don't get a service, that's ok, then just don't show progress
if (showProgresssDialog) {
nsCOMPtr<nsIPrintingPromptService> printPromptService(do_GetService(kPrintingPromptService));
if (printPromptService) {
- nsPIDOMWindowOuter* domWin = mDocument->GetWindow();
+ nsPIDOMWindowOuter* domWin = mDocument->GetWindow();
if (!domWin) return;
nsCOMPtr<nsIDocShell> docShell = domWin->GetDocShell();
if (!docShell) return;
nsCOMPtr<nsIDocShellTreeOwner> owner;
docShell->GetTreeOwner(getter_AddRefs(owner));
nsCOMPtr<nsIWebBrowserChrome> browserChrome = do_GetInterface(owner);
if (!browserChrome) return;
@@ -1065,18 +1065,18 @@ nsPrintEngine::ShowPrintProgress(bool aI
// isn't supported. See bug 301560.
return;
}
nsCOMPtr<nsIWebProgressListener> printProgressListener;
nsCOMPtr<nsIWebBrowserPrint> wbp(do_QueryInterface(mDocViewerPrint));
nsresult rv = printPromptService->ShowProgress(domWin, wbp, mPrt->mPrintSettings, this, aIsForPrinting,
- getter_AddRefs(printProgressListener),
- getter_AddRefs(mPrt->mPrintProgressParams),
+ getter_AddRefs(printProgressListener),
+ getter_AddRefs(mPrt->mPrintProgressParams),
&aDoNotify);
if (NS_SUCCEEDED(rv)) {
if (printProgressListener) {
mPrt->mPrintProgressListeners.AppendObject(printProgressListener);
}
if (mPrt->mPrintProgressParams) {
SetDocAndURLIntoProgress(mPrt->mPrintObject, mPrt->mPrintProgressParams);
@@ -1386,17 +1386,17 @@ nsPrintEngine::IsThereAnIFrameSelected(n
iFrameIsSelected = po && po->mFrameType == eIFrame;
} else {
// First, check to see if we are a frameset
if (!aIsParentFrameSet) {
// Check to see if there is a currenlt focused frame
// if so, it means the selected frame is either the main docshell
// or an IFRAME
if (aDOMWin) {
- // Get the main docshell's DOMWin to see if it matches
+ // Get the main docshell's DOMWin to see if it matches
// the frame that is selected
nsPIDOMWindowOuter* domWin = aDocShell ? aDocShell->GetWindow() : nullptr;
if (domWin != aDOMWin) {
iFrameIsSelected = true; // we have a selected IFRAME
}
}
}
}
@@ -1412,17 +1412,17 @@ nsPrintEngine::SetPrintPO(nsPrintObject*
{
NS_ASSERTION(aPO, "Pointer is null!");
// Set whether to print flag
aPO->mDontPrint = !aPrint;
for (uint32_t i=0;i<aPO->mKids.Length();i++) {
SetPrintPO(aPO->mKids[i], aPrint);
- }
+ }
}
//---------------------------------------------------------------------
// This will first use a Title and/or URL from the PrintSettings
// if one isn't set then it uses the one from the document
// then if not title is there we will make sure we send something back
// depending on the situation.
void
@@ -1509,28 +1509,28 @@ nsresult nsPrintEngine::CleanupOnFailure
PR_PL(("**** Failed %s - rv 0x%" PRIX32, aIsPrinting?"Printing":"Print Preview",
static_cast<uint32_t>(aResult)));
/* cleanup... */
if (mPagePrintTimer) {
mPagePrintTimer->Stop();
DisconnectPagePrintTimer();
}
-
+
if (aIsPrinting) {
SetIsPrinting(false);
} else {
SetIsPrintPreview(false);
SetIsCreatingPrintPreview(false);
}
/* cleanup done, let's fire-up an error dialog to notify the user
- * what went wrong...
- *
- * When rv == NS_ERROR_ABORT, it means we want out of the
+ * what went wrong...
+ *
+ * When rv == NS_ERROR_ABORT, it means we want out of the
* print job without displaying any error messages
*/
if (aResult != NS_ERROR_ABORT) {
FirePrintingErrorEvent(aResult);
}
FirePrintCompletionEvent();
@@ -1609,23 +1609,23 @@ nsPrintEngine::ReconstructAndReflow(bool
po->mPresShell->ReconstructFrames();
// For all views except the first one, setup the root view.
// ??? Can there be multiple po for the top-level-document?
bool documentIsTopLevel = true;
if (i != 0) {
nsSize adjSize;
- bool doReturn;
+ bool doReturn;
nsresult rv = SetRootView(po, doReturn, documentIsTopLevel, adjSize);
MOZ_ASSERT(!documentIsTopLevel, "How could this happen?");
-
+
if (NS_FAILED(rv) || doReturn) {
- return rv;
+ return rv;
}
}
po->mPresShell->FlushPendingNotifications(FlushType::Layout);
nsresult rv = UpdateSelectionAndShrinkPrintObject(po, documentIsTopLevel);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -1634,17 +1634,17 @@ nsPrintEngine::ReconstructAndReflow(bool
//-------------------------------------------------------
nsresult
nsPrintEngine::SetupToPrintContent()
{
nsresult rv;
bool didReconstruction = false;
-
+
// If some new content got loaded since the initial reflow rebuild
// everything.
if (mDidLoadDataForPrinting) {
rv = ReconstructAndReflow(DoSetPixelScale());
didReconstruction = true;
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -1685,36 +1685,36 @@ nsPrintEngine::SetupToPrintContent()
// Single document so use the Shrink as calculated for the PO
calcRatio = mPrt->mPrintObject->mShrinkRatio;
}
PR_PL(("**************************************************************************\n"));
PR_PL(("STF Ratio is: %8.5f Effective Ratio: %8.5f Diff: %8.5f\n", mPrt->mShrinkRatio, calcRatio, mPrt->mShrinkRatio-calcRatio));
PR_PL(("**************************************************************************\n"));
}
}
-
+
// If the frames got reconstructed and reflowed the number of pages might
// has changed.
if (didReconstruction) {
FirePrintPreviewUpdateEvent();
}
-
+
DUMP_DOC_LIST(("\nAfter Reflow------------------------------------------"));
PR_PL(("\n"));
PR_PL(("-------------------------------------------------------\n"));
PR_PL(("\n"));
CalcNumPrintablePages(mPrt->mNumPrintablePages);
PR_PL(("--- Printing %d pages\n", mPrt->mNumPrintablePages));
DUMP_DOC_TREELAYOUT;
// Print listener setup...
if (mPrt != nullptr) {
- mPrt->OnStartPrinting();
+ mPrt->OnStartPrinting();
}
nsAutoString fileNameStr;
// check to see if we are printing to a file
bool isPrintToFile = false;
mPrt->mPrintSettings->GetPrintToFile(&isPrintToFile);
if (isPrintToFile) {
// On some platforms The BeginDocument needs to know the name of the file.
@@ -1737,30 +1737,30 @@ nsPrintEngine::SetupToPrintContent()
mPrt->mPrintSettings->GetEndPageRange(&endPage);
if (endPage > mPrt->mNumPrintablePages) {
endPage = mPrt->mNumPrintablePages;
}
}
rv = NS_OK;
// BeginDocument may pass back a FAILURE code
- // i.e. On Windows, if you are printing to a file and hit "Cancel"
+ // i.e. On Windows, if you are printing to a file and hit "Cancel"
// to the "File Name" dialog, this comes back as an error
- // Don't start printing when regression test are executed
+ // Don't start printing when regression test are executed
if (!mPrt->mDebugFilePtr && mIsDoingPrinting) {
rv = mPrt->mPrintDC->BeginDocument(docTitleStr, fileNameStr, startPage,
endPage);
- }
+ }
if (mIsCreatingPrintPreview) {
// Copy docTitleStr and docURLStr to the pageSequenceFrame, to be displayed
// in the header
nsIPageSequenceFrame *seqFrame = mPrt->mPrintObject->mPresShell->GetPageSequenceFrame();
if (seqFrame) {
- seqFrame->StartPrint(mPrt->mPrintObject->mPresContext,
+ seqFrame->StartPrint(mPrt->mPrintObject->mPresContext,
mPrt->mPrintSettings, docTitleStr, docURLStr);
}
}
PR_PL(("****************** Begin Document ************************\n"));
NS_ENSURE_SUCCESS(rv, rv);
@@ -1875,17 +1875,17 @@ nsPrintEngine::OnStateChange(nsIWebProgr
if (name.EqualsLiteral("about:document-onload-blocker")) {
return NS_OK;
}
if (aStateFlags & STATE_START) {
++mLoadCounter;
} else if (aStateFlags & STATE_STOP) {
mDidLoadDataForPrinting = true;
--mLoadCounter;
-
+
// If all resources are loaded, then do a small timeout and if there
// are still no new requests, then another reflow.
if (mLoadCounter == 0) {
AfterNetworkPrint(true);
}
}
return NS_OK;
}
@@ -1947,17 +1947,17 @@ nsPrintEngine::UpdateZoomRatio(nsPrintOb
} else {
ratio = aPO->mShrinkRatio - 0.005f; // round down
}
aPO->mZoomRatio = ratio;
} else if (!mPrt->mShrinkToFit) {
double scaling;
mPrt->mPrintSettings->GetScaling(&scaling);
aPO->mZoomRatio = float(scaling);
- }
+ }
}
nsresult
nsPrintEngine::UpdateSelectionAndShrinkPrintObject(nsPrintObject* aPO,
bool aDocumentIsTopLevel)
{
nsCOMPtr<nsIPresShell> displayShell = aPO->mDocShell->GetPresShell();
// Transfer Selection Ranges to the new Print PresShell
@@ -1990,17 +1990,17 @@ nsPrintEngine::UpdateSelectionAndShrinkP
nsIPageSequenceFrame* pageSequence = aPO->mPresShell->GetPageSequenceFrame();
NS_ENSURE_STATE(pageSequence);
pageSequence->GetSTFPercent(aPO->mShrinkRatio);
// Limit the shrink-to-fit scaling for some text-ish type of documents.
nsAutoString contentType;
aPO->mPresShell->GetDocument()->GetContentType(contentType);
if (contentType.EqualsLiteral("application/xhtml+xml") ||
StringBeginsWith(contentType, NS_LITERAL_STRING("text/"))) {
- int32_t limitPercent =
+ int32_t limitPercent =
Preferences::GetInt("print.shrink-to-fit.scale-limit-percent", 20);
limitPercent = std::max(0, limitPercent);
limitPercent = std::min(100, limitPercent);
float minShrinkRatio = float(limitPercent) / 100;
aPO->mShrinkRatio = std::max(aPO->mShrinkRatio, minShrinkRatio);
}
}
return NS_OK;
@@ -2033,19 +2033,19 @@ nsPrintEngine::GetParentViewForRoot()
return cv->FindContainerView();
}
}
return nullptr;
}
nsresult
nsPrintEngine::SetRootView(
- nsPrintObject* aPO,
- bool& doReturn,
- bool& documentIsTopLevel,
+ nsPrintObject* aPO,
+ bool& doReturn,
+ bool& documentIsTopLevel,
nsSize& adjSize
)
{
bool canCreateScrollbars = true;
nsView* rootView;
nsView* parentView = nullptr;
@@ -2092,17 +2092,17 @@ nsPrintEngine::SetRootView(
aPO->mViewManager->RemoveChild(rootView);
rootView->SetParent(parentView);
} else {
// Create a child window of the parent that is our "root view/window"
nsRect tbounds = nsRect(nsPoint(0, 0), adjSize);
rootView = aPO->mViewManager->CreateView(tbounds, parentView);
NS_ENSURE_TRUE(rootView, NS_ERROR_OUT_OF_MEMORY);
}
-
+
if (mIsCreatingPrintPreview && documentIsTopLevel) {
aPO->mPresContext->SetPaginatedScrolling(canCreateScrollbars);
}
// Setup hierarchical relationship in view manager
aPO->mViewManager->SetRootView(rootView);
return NS_OK;
@@ -2112,17 +2112,17 @@ nsPrintEngine::SetRootView(
nsresult
nsPrintEngine::ReflowPrintObject(nsPrintObject * aPO)
{
NS_ENSURE_STATE(aPO);
if (!aPO->IsPrintable()) {
return NS_OK;
}
-
+
NS_ASSERTION(!aPO->mPresContext, "Recreating prescontext");
// create the PresContext
nsPresContext::nsPresContextType type =
mIsCreatingPrintPreview ? nsPresContext::eContext_PrintPreview:
nsPresContext::eContext_Print;
nsView* parentView =
aPO->mParent && aPO->mParent->IsPrintable() ? nullptr : GetParentViewForRoot();
@@ -2153,28 +2153,28 @@ nsPrintEngine::ReflowPrintObject(nsPrint
aPO->mPresShell = aPO->mDocument->CreateShell(aPO->mPresContext,
aPO->mViewManager, styleSet);
if (!aPO->mPresShell) {
styleSet->Delete();
return NS_ERROR_FAILURE;
}
styleSet->EndUpdate();
-
+
// The pres shell now owns the style set object.
bool doReturn = false;;
bool documentIsTopLevel = false;
- nsSize adjSize;
+ nsSize adjSize;
rv = SetRootView(aPO, doReturn, documentIsTopLevel, adjSize);
if (NS_FAILED(rv) || doReturn) {
- return rv;
+ return rv;
}
PR_PL(("In DV::ReflowPrintObject PO: %p pS: %p (%9s) Setting w,h to %d,%d\n", aPO, aPO->mPresShell.get(),
gFrameTypesStr[aPO->mFrameType], adjSize.width, adjSize.height));
// This docshell stuff is weird; will go away when we stop having multiple
// presentations per document
@@ -2728,17 +2728,17 @@ nsPrintEngine::PrintPage(nsPrintObject*
endPage = numPages;
aInRange = true;
}
// XXX This is wrong, but the actual behavior in the presence of a print
// range sucks.
if (mPrt->mPrintFrameType == nsIPrintSettings::kEachFrameSep)
endPage = mPrt->mNumPrintablePages;
-
+
mPrt->DoOnProgressChange(++mPrt->mNumPagesPrinted, endPage, false, 0);
// Print the Page
// if a print job was cancelled externally, an EndPage or BeginPage may
// fail and the failure is passed back here.
// Returning true means we are done printing.
//
// When rv == NS_ERROR_ABORT, it means we want out of the
@@ -2929,32 +2929,32 @@ nsPrintEngine::GetPageRangeForSelection(
//-----------------------------------------------------------------
//-- Section: Misc Support Methods
//-----------------------------------------------------------------
//---------------------------------------------------------------------
void nsPrintEngine::SetIsPrinting(bool aIsPrinting)
-{
+{
mIsDoingPrinting = aIsPrinting;
// Calling SetIsPrinting while in print preview confuses the document viewer
// This is safe because we prevent exiting print preview while printing
if (!mIsDoingPrintPreview && mDocViewerPrint) {
mDocViewerPrint->SetIsPrinting(aIsPrinting);
}
if (mPrt && aIsPrinting) {
mPrt->mPreparingForPrint = true;
}
}
//---------------------------------------------------------------------
-void nsPrintEngine::SetIsPrintPreview(bool aIsPrintPreview)
-{
- mIsDoingPrintPreview = aIsPrintPreview;
+void nsPrintEngine::SetIsPrintPreview(bool aIsPrintPreview)
+{
+ mIsDoingPrintPreview = aIsPrintPreview;
if (mDocViewerPrint) {
mDocViewerPrint->SetIsPrintPreview(aIsPrintPreview);
}
}
//---------------------------------------------------------------------
void
@@ -2982,17 +2982,17 @@ bool nsPrintEngine::HasFramesetChild(nsI
child = child->GetNextSibling()) {
if (child->IsHTMLElement(nsGkAtoms::frameset)) {
return true;
}
}
return false;
}
-
+
/** ---------------------------------------------------
* Get the Focused Frame for a documentviewer
*/
already_AddRefed<nsPIDOMWindowOuter>
nsPrintEngine::FindFocusedDOMWindow()
{
@@ -3518,17 +3518,17 @@ nsPrintEngine::StartPagePrintTimer(nsPri
}
}
}
return mPagePrintTimer->Start(aPO);
}
/*=============== nsIObserver Interface ======================*/
-NS_IMETHODIMP
+NS_IMETHODIMP
nsPrintEngine::Observe(nsISupports *aSubject, const char *aTopic, const char16_t *aData)
{
nsresult rv = NS_ERROR_FAILURE;
rv = InitPrintDocConstruction(true);
if (!mIsDoingPrinting && mPrtPreview) {
mPrtPreview->OnEndPrinting();
}