diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-04-04 13:38:29 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-04 18:21:06 +0000 |
| commit | c3202a95773d7a2c95038ad45c5ba2c9e095e67b (patch) | |
| tree | 4742e65e173bbfec56a10b249abee6d9934047bd /core/fxge/cfx_renderdevice.h | |
| parent | 6088612c21898eb79cfbde401984176dd94c385c (diff) | |
| download | pdfium-c3202a95773d7a2c95038ad45c5ba2c9e095e67b.tar.xz | |
Let CPDF_ImageRenderer own the CFX_ImageRenderer
This CL avoids some void* usage and removes CancelDIBits after making a
CPDF_ImageRenderer own its CFX_ImageRenderer.
Bug: pdfium:686
Change-Id: Ied205c57a858cc14d8e2c592db3444ed465b2796
Reviewed-on: https://pdfium-review.googlesource.com/3673
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fxge/cfx_renderdevice.h')
| -rw-r--r-- | core/fxge/cfx_renderdevice.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index d56c2ecb9a..794c2fec6b 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -15,6 +15,7 @@ class CFX_Font; class CFX_GraphStateData; +class CFX_ImageRenderer; class IFX_RenderDeviceDriver; #define FXDC_DEVICE_CLASS 1 @@ -193,7 +194,7 @@ class CFX_RenderDevice { uint32_t color, const CFX_Matrix* pMatrix, uint32_t flags, - void*& handle) { + std::unique_ptr<CFX_ImageRenderer>* handle) { return StartDIBitsWithBlend(pBitmap, bitmap_alpha, color, pMatrix, flags, handle, FXDIB_BLEND_NORMAL); } @@ -202,10 +203,9 @@ class CFX_RenderDevice { uint32_t color, const CFX_Matrix* pMatrix, uint32_t flags, - void*& handle, + std::unique_ptr<CFX_ImageRenderer>* handle, int blend_type); - bool ContinueDIBits(void* handle, IFX_Pause* pPause); - void CancelDIBits(void* handle); + bool ContinueDIBits(CFX_ImageRenderer* handle, IFX_Pause* pPause); bool DrawNormalText(int nChars, const FXTEXT_CHARPOS* pCharPos, |