| Index: core/fxge/skia/fx_skia_device.h
|
| diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
|
| index 8ce7c6c61f25049a96d50107fe451ade4ec02b7b..afc505da6e20b4f9eb8d345eeb1a0688979950eb 100644
|
| --- a/core/fxge/skia/fx_skia_device.h
|
| +++ b/core/fxge/skia/fx_skia_device.h
|
| @@ -50,15 +50,15 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
|
| FX_BOOL DrawPath(const CFX_PathData* pPathData,
|
| const CFX_Matrix* pObject2Device,
|
| const CFX_GraphStateData* pGraphState,
|
| - FX_DWORD fill_color,
|
| - FX_DWORD stroke_color,
|
| + uint32_t fill_color,
|
| + uint32_t stroke_color,
|
| int fill_mode,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL,
|
| int blend_type = FXDIB_BLEND_NORMAL) override;
|
|
|
| FX_BOOL FillRect(const FX_RECT* pRect,
|
| - FX_DWORD fill_color,
|
| + uint32_t fill_color,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL,
|
| int blend_type = FXDIB_BLEND_NORMAL) override;
|
| @@ -68,7 +68,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
|
| FX_FLOAT y1,
|
| FX_FLOAT x2,
|
| FX_FLOAT y2,
|
| - FX_DWORD color,
|
| + uint32_t color,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL,
|
| int blend_type = FXDIB_BLEND_NORMAL) override {
|
| @@ -87,7 +87,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
|
| CFX_DIBitmap* GetBackDrop() override { return m_pAggDriver->GetBackDrop(); }
|
|
|
| FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
|
| - FX_DWORD color,
|
| + uint32_t color,
|
| const FX_RECT* pSrcRect,
|
| int dest_left,
|
| int dest_top,
|
| @@ -95,22 +95,22 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL) override;
|
| FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
|
| - FX_DWORD color,
|
| + uint32_t color,
|
| int dest_left,
|
| int dest_top,
|
| int dest_width,
|
| int dest_height,
|
| const FX_RECT* pClipRect,
|
| - FX_DWORD flags,
|
| + uint32_t flags,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL,
|
| int blend_type = FXDIB_BLEND_NORMAL) override;
|
|
|
| FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
|
| int bitmap_alpha,
|
| - FX_DWORD color,
|
| + uint32_t color,
|
| const CFX_Matrix* pMatrix,
|
| - FX_DWORD flags,
|
| + uint32_t flags,
|
| void*& handle,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL,
|
| @@ -124,7 +124,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver {
|
| CFX_FontCache* pCache,
|
| const CFX_Matrix* pObject2Device,
|
| FX_FLOAT font_size,
|
| - FX_DWORD color,
|
| + uint32_t color,
|
| int alpha_flag = 0,
|
| void* pIccTransform = NULL) override;
|
|
|
|
|