| Index: 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 15f9706b3f771561bbc83fa23b5396a82f324148..ff02ec72515ea6fb5bfd094ddd6588d19a6d4abc 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 <memory>
|
| +#include <vector>
|
| +
|
| #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<CFX_ClipRgn*> m_StateStack;
|
| + std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
|
| + std::vector<std::unique_ptr<CFX_ClipRgn>> 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;
|
|
|