RandomHuman
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[printing] Fix build bustage with --disable-printing.

This commit is contained in:
Fedor 2020-06-10 21:12:19 +03:00
parent 2f4f7d8270
commit 94b5dd401f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/thebes/PrintTargetWindows.cpp
View File

@ -26,6 +26,7 @@ PrintTargetWindows::PrintTargetWindows(cairo_surface_t* aCairoSurface,
/* static */ already_AddRefed<PrintTargetWindows> /* static */ already_AddRefed<PrintTargetWindows>
PrintTargetWindows::CreateOrNull(HDC aDC) PrintTargetWindows::CreateOrNull(HDC aDC)
{ {
#ifdef NS_PRINTING
// Figure out the cairo surface size - Windows we need to use the printable // Figure out the cairo surface size - Windows we need to use the printable
// area of the page. Note: we only scale the printing using the LOGPIXELSY, // area of the page. Note: we only scale the printing using the LOGPIXELSY,
// so we use that when calculating the surface width as well as the height. // so we use that when calculating the surface width as well as the height.
@ -51,6 +52,9 @@ PrintTargetWindows::CreateOrNull(HDC aDC)
new PrintTargetWindows(surface, size, aDC); new PrintTargetWindows(surface, size, aDC);
return target.forget(); return target.forget();
#else
return nullptr;
#endif
} }
nsresult nsresult

2
layout/base/nsDocumentViewer.cpp
View File

@ -544,10 +544,12 @@ nsDocumentViewer::~nsDocumentViewer()
mDocument->Destroy(); mDocument->Destroy();
} }
#ifdef NS_PRINTING
if (mPrintEngine) { if (mPrintEngine) {
mPrintEngine->Destroy(); mPrintEngine->Destroy();
mPrintEngine = nullptr; mPrintEngine = nullptr;
} }
#endif
MOZ_RELEASE_ASSERT(mDestroyRefCount == 0); MOZ_RELEASE_ASSERT(mDestroyRefCount == 0);
NS_ASSERTION(!mPresShell && !mPresContext, NS_ASSERTION(!mPresShell && !mPresContext,