summaryrefslogtreecommitdiff
path: root/core/fxge/skia/fx_skia_device.h
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-03-27 14:24:34 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-03-27 18:42:14 +0000
commit48a2fac4f04a56d2e1cd7b2e61069fd06d39c1a9 (patch)
tree8b28bbc1d9c8ae4f26f14ad07a1522ea155e9415 /core/fxge/skia/fx_skia_device.h
parent43c195016f9c2e38654a484f9472c138b92d3ec3 (diff)
downloadpdfium-48a2fac4f04a56d2e1cd7b2e61069fd06d39c1a9.tar.xz
Fix some ASAN issues in fx_skia_device
- Flush is needed in ~CFX_FxgeDevice, otherwise it may be called after deleting the bitmap, when calling the destructor of the skia device driver. - SkDashPathEffect::Make copies the given intervals instead of owning them, so free the input to that method. - If StartDIBits creates a new CFX_ImageRenderer, then the corresponding CancelDIBits needs to delete the handle. Bug: chromium:705131 Change-Id: I22c7c51a4070e73538eb8af51a60afeaa67f8bb7 Reviewed-on: https://pdfium-review.googlesource.com/3230 Commit-Queue: Nicolás Peña <npm@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/skia/fx_skia_device.h')
-rw-r--r--core/fxge/skia/fx_skia_device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index b26ebdd724..494e6e1c44 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -122,7 +122,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
bool ContinueDIBits(void* handle, IFX_Pause* pPause) override;
- void CancelDIBits(void* handle) override {}
+ void CancelDIBits(void* handle) override;
bool DrawBitsWithMask(const CFX_DIBSource* pBitmap,
const CFX_DIBSource* pMask,