diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-28 09:31:32 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-28 16:42:55 +0000 |
| commit | f0799fe84df4d86f25d342b03525f3016d674f86 (patch) | |
| tree | d6839802a68b7b6ad6fb166179ede779c3560c75 /fpdfsdk/fpdf_progressive.cpp | |
| parent | 31b08d4cdaa17d7a03f35e087096a77036af98ec (diff) | |
| download | pdfium-f0799fe84df4d86f25d342b03525f3016d674f86.tar.xz | |
Revert "Revert "Refcount all CFX_DIBSources (and subclasses) all the time.""
This reverts commit 31b08d4cdaa17d7a03f35e087096a77036af98ec.
Re-landing the patch after fixing skia build issue.
Change-Id: Ie7039890088b803a6ec5ce365d70f57277459b48
Reviewed-on: https://pdfium-review.googlesource.com/3245
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_progressive.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_progressive.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index cc09d07638..927bcddd09 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -6,6 +6,8 @@ #include "public/fpdf_progressive.h" +#include <utility> + #include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/render/cpdf_progressiverenderer.h" @@ -44,11 +46,14 @@ DLLEXPORT int STDCALL FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap, if (!pPage) return FPDF_RENDER_FAILED; - CPDF_PageRenderContext* pContext = new CPDF_PageRenderContext; - pPage->SetRenderContext(pdfium::WrapUnique(pContext)); - CFX_FxgeDevice* pDevice = new CFX_FxgeDevice; - pContext->m_pDevice.reset(pDevice); - CFX_DIBitmap* pBitmap = CFXBitmapFromFPDFBitmap(bitmap); + auto pOwnedContext = pdfium::MakeUnique<CPDF_PageRenderContext>(); + CPDF_PageRenderContext* pContext = pOwnedContext.get(); + pPage->SetRenderContext(std::move(pOwnedContext)); + + CFX_RetainPtr<CFX_DIBitmap> pBitmap(CFXBitmapFromFPDFBitmap(bitmap)); + auto pOwnedDevice = pdfium::MakeUnique<CFX_FxgeDevice>(); + CFX_FxgeDevice* pDevice = pOwnedDevice.get(); + pContext->m_pDevice = std::move(pOwnedDevice); pDevice->Attach(pBitmap, !!(flags & FPDF_REVERSE_BYTE_ORDER), nullptr, false); IFSDK_PAUSE_Adapter IPauseAdapter(pause); |