| 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 2c4e292fafadc3451ede45392359cfe1d2a2e0a8..48d6fae87f5985e215bac3e4bc1c5c3fa91a7791 100644
|
| --- a/core/fxge/agg/fx_agg_driver.h
|
| +++ b/core/fxge/agg/fx_agg_driver.h
|
| @@ -52,44 +52,20 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| uint32_t fill_color,
|
| uint32_t stroke_color,
|
| int fill_mode,
|
| - int alpha_flag,
|
| - void* pIccTransform,
|
| int blend_type) override;
|
| - FX_BOOL SetPixel(int x,
|
| - int y,
|
| - uint32_t color,
|
| - int alpha_flag,
|
| - void* pIccTransform) override;
|
| - FX_BOOL FillRect(const FX_RECT* pRect,
|
| - uint32_t fill_color,
|
| - int alpha_flag,
|
| - void* pIccTransform,
|
| - int blend_type) override;
|
| - FX_BOOL DrawCosmeticLine(FX_FLOAT x1,
|
| - FX_FLOAT y1,
|
| - FX_FLOAT x2,
|
| - FX_FLOAT y2,
|
| - uint32_t color,
|
| - int alpha_flag,
|
| - void* pIccTransform,
|
| - int blend_type) override {
|
| - return FALSE;
|
| - }
|
| + FX_BOOL SetPixel(int x, int y, uint32_t color) override;
|
| + FX_BOOL FillRectWithBlend(const FX_RECT* pRect,
|
| + uint32_t fill_color,
|
| + int blend_type) override;
|
| FX_BOOL GetClipBox(FX_RECT* pRect) override;
|
| - FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap,
|
| - int left,
|
| - int top,
|
| - void* pIccTransform = nullptr,
|
| - FX_BOOL bDEdge = FALSE) override;
|
| + FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override;
|
| CFX_DIBitmap* GetBackDrop() override { return m_pOriDevice; }
|
| FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
|
| uint32_t color,
|
| const FX_RECT* pSrcRect,
|
| int left,
|
| int top,
|
| - int blend_type,
|
| - int alpha_flag,
|
| - void* pIccTransform) override;
|
| + int blend_type) override;
|
| FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
|
| uint32_t color,
|
| int dest_left,
|
| @@ -98,8 +74,6 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| int dest_height,
|
| const FX_RECT* pClipRect,
|
| uint32_t flags,
|
| - int alpha_flag,
|
| - void* pIccTransform,
|
| int blend_type) override;
|
| FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
|
| int bitmap_alpha,
|
| @@ -107,8 +81,6 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| const CFX_Matrix* pMatrix,
|
| uint32_t flags,
|
| void*& handle,
|
| - int alpha_flag,
|
| - void* pIccTransform,
|
| int blend_type) override;
|
| FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override;
|
| void CancelDIBits(void* handle) override;
|
| @@ -118,9 +90,7 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
|
| CFX_FontCache* pCache,
|
| const CFX_Matrix* pObject2Device,
|
| FX_FLOAT font_size,
|
| - uint32_t color,
|
| - int alpha_flag,
|
| - void* pIccTransform) override;
|
| + uint32_t color) override;
|
| int GetDriverType() const override { return 1; }
|
|
|
| FX_BOOL RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
|
|
|