From c38cd6eb274429a5755e04d2e22a606375851717 Mon Sep 17 00:00:00 2001 From: weili Date: Thu, 21 Jul 2016 14:44:17 -0700 Subject: Use smart pointers for graphics device classes Use unique_ptr for class owned member variables. Also clean up some style issues such as removing unused functions and casting to raw pointer. BUG=pdfium:518 Review-Url: https://codereview.chromium.org/2163103002 --- core/fxge/agg/fx_agg_driver.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'core/fxge/agg/fx_agg_driver.h') diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h index 15f9706b3f..ff02ec7251 100644 --- a/core/fxge/agg/fx_agg_driver.h +++ b/core/fxge/agg/fx_agg_driver.h @@ -7,6 +7,9 @@ #ifndef CORE_FXGE_AGG_FX_AGG_DRIVER_H_ #define CORE_FXGE_AGG_FX_AGG_DRIVER_H_ +#include +#include + #include "core/fxge/include/ifx_renderdevicedriver.h" #include "third_party/agg23/agg_clip_liang_barsky.h" #include "third_party/agg23/agg_path_storage.h" @@ -108,11 +111,11 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver { private: CFX_DIBitmap* m_pBitmap; - CFX_ClipRgn* m_pClipRgn; - CFX_ArrayTemplate m_StateStack; + std::unique_ptr m_pClipRgn; + std::vector> m_StateStack; +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ void* m_pPlatformGraphics; - void* m_pPlatformBitmap; - void* m_pDwRenderTartget; +#endif int m_FillFlags; FX_BOOL m_bRgbByteOrder; CFX_DIBitmap* m_pOriDevice; -- cgit v1.2.3