wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 665218 - Keep the printing surface until the next BeginPage to avoid null-ptr crash [MacOSX only]. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2011-07-19 14:20:33 +02:00
parent d93810c1a5
commit 5437bbbfbe
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/src/nsDeviceContext.cpp
View File

@ -634,10 +634,14 @@ nsDeviceContext::BeginPage(void)
if (NS_FAILED(rv)) return rv;
/* We need to get a new surface for each page on the Mac */
#ifdef XP_MACOSX
// We need to get a new surface for each page on the Mac, as the
// CGContextRefs are only good for one page.
// And we don't null it out in EndPage because mPrintingSurface needs
// to be available also in-between EndPage/BeginPage (bug 665218).
mDeviceContextSpec->GetSurfaceForPrinter(getter_AddRefs(mPrintingSurface));
#endif
rv = mPrintingSurface->BeginPage();
return rv;
@ -648,13 +652,6 @@ nsDeviceContext::EndPage(void)
{
nsresult rv = mPrintingSurface->EndPage();
/* We need to release the CGContextRef in the surface here, plus it's
not something you would want anyway, as these CGContextRefs are only good
for one page. */
#ifdef XP_MACOSX
mPrintingSurface = nsnull;
#endif
if (mDeviceContextSpec)
mDeviceContextSpec->EndPage();