diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-05-26 13:08:36 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-26 20:46:30 +0000 |
| commit | 385d32f64613f08bad5cb63f0b8dc4f847f240f4 (patch) | |
| tree | ed835312989fcf493328605b423ef67faa69f64a /fpdfsdk/fpdf_progressive.cpp | |
| parent | 06bbdef296b483e6f666156b198319019d3c6373 (diff) | |
| download | pdfium-385d32f64613f08bad5cb63f0b8dc4f847f240f4.tar.xz | |
Fix CPDF_PageRenderContext cleanup
Make CFX_RenderDevice, which owns the IFX_RenderDeviceDriver, responsible
for restoring driver state as part of its destruction so that its callers
don't have to do so out of turn.
Then re-order CPDF_PageRenderContext destruction order so that
the progressive renderer is destroyed before the device, and the
device destroyed before the options because of unowned pointers
to objects owned by these.
Bug: 726755
Change-Id: I9a6f23da12140b2758b86e6f33f715ad1c679c3f
Reviewed-on: https://pdfium-review.googlesource.com/6073
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_progressive.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_progressive.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index fc6ceab38e..2d8f125128 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -88,13 +88,6 @@ DLLEXPORT int STDCALL FPDF_RenderPage_Continue(FPDF_PAGE page, DLLEXPORT void STDCALL FPDF_RenderPage_Close(FPDF_PAGE page) { CPDF_Page* pPage = CPDFPageFromFPDFPage(page); - if (!pPage) - return; - - CPDF_PageRenderContext* pContext = pPage->GetRenderContext(); - if (!pContext) - return; - - pContext->m_pDevice->RestoreState(false); - pPage->SetRenderContext(nullptr); + if (pPage) + pPage->SetRenderContext(nullptr); } |