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 eb5063aafb111b108511bfb05db7b4976efaeb19..199e76689aa27e28a6d186fcbea79e235aa0807d 100644 |
--- a/core/fxge/skia/fx_skia_device.h |
+++ b/core/fxge/skia/fx_skia_device.h |
@@ -22,9 +22,9 @@ struct SkIRect; |
class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { |
public: |
CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap, |
- FX_BOOL bRgbByteOrder, |
+ bool bRgbByteOrder, |
CFX_DIBitmap* pOriDevice, |
- FX_BOOL bGroupKnockout); |
+ bool bGroupKnockout); |
explicit CFX_SkiaDeviceDriver(SkPictureRecorder* recorder); |
CFX_SkiaDeviceDriver(int size_x, int size_y); |
~CFX_SkiaDeviceDriver() override; |
@@ -37,13 +37,13 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { |
void RestoreState(bool bKeepSaved) override; |
/** Set clipping path using filled region */ |
- FX_BOOL SetClip_PathFill( |
+ bool SetClip_PathFill( |
const CFX_PathData* pPathData, // path info |
const CFX_Matrix* pObject2Device, // optional transformation |
int fill_mode) override; // fill mode, WINDING or ALTERNATE |
/** Set clipping path using stroked region */ |
- FX_BOOL SetClip_PathStroke( |
+ bool SetClip_PathStroke( |
const CFX_PathData* pPathData, // path info |
const CFX_Matrix* pObject2Device, // optional transformation |
const CFX_GraphStateData* |
@@ -51,64 +51,64 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { |
override; |
/** Draw a path */ |
- FX_BOOL DrawPath(const CFX_PathData* pPathData, |
- const CFX_Matrix* pObject2Device, |
- const CFX_GraphStateData* pGraphState, |
- uint32_t fill_color, |
- uint32_t stroke_color, |
- int fill_mode, |
- int blend_type) override; |
- |
- FX_BOOL FillRectWithBlend(const FX_RECT* pRect, |
- uint32_t fill_color, |
- int blend_type) override; |
+ bool DrawPath(const CFX_PathData* pPathData, |
+ const CFX_Matrix* pObject2Device, |
+ const CFX_GraphStateData* pGraphState, |
+ uint32_t fill_color, |
+ uint32_t stroke_color, |
+ int fill_mode, |
+ int blend_type) override; |
+ |
+ bool FillRectWithBlend(const FX_RECT* pRect, |
+ uint32_t fill_color, |
+ int blend_type) override; |
/** Draw a single pixel (device dependant) line */ |
- FX_BOOL DrawCosmeticLine(FX_FLOAT x1, |
- FX_FLOAT y1, |
- FX_FLOAT x2, |
- FX_FLOAT y2, |
- uint32_t color, |
- int blend_type) override; |
+ bool DrawCosmeticLine(FX_FLOAT x1, |
+ FX_FLOAT y1, |
+ FX_FLOAT x2, |
+ FX_FLOAT y2, |
+ uint32_t color, |
+ int blend_type) override; |
- FX_BOOL GetClipBox(FX_RECT* pRect) override; |
+ bool GetClipBox(FX_RECT* pRect) override; |
/** Load device buffer into a DIB */ |
- FX_BOOL GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override; |
+ bool GetDIBits(CFX_DIBitmap* pBitmap, int left, int top) override; |
CFX_DIBitmap* GetBackDrop() override; |
- FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap, |
- uint32_t color, |
- const FX_RECT* pSrcRect, |
- int dest_left, |
- int dest_top, |
- int blend_type) override; |
+ bool SetDIBits(const CFX_DIBSource* pBitmap, |
+ uint32_t color, |
+ const FX_RECT* pSrcRect, |
+ int dest_left, |
+ int dest_top, |
+ int blend_type) override; |
bool SetBitsWithMask(const CFX_DIBSource* pBitmap, |
const CFX_DIBSource* pMask, |
int dest_left, |
int dest_top, |
int bitmap_alpha, |
int blend_type) override; |
- FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap, |
- uint32_t color, |
- int dest_left, |
- int dest_top, |
- int dest_width, |
- int dest_height, |
- const FX_RECT* pClipRect, |
- uint32_t flags, |
- int blend_type) override; |
- |
- FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap, |
- int bitmap_alpha, |
- uint32_t color, |
- const CFX_Matrix* pMatrix, |
- uint32_t flags, |
- void*& handle, |
- int blend_type) override; |
+ bool StretchDIBits(const CFX_DIBSource* pBitmap, |
+ uint32_t color, |
+ int dest_left, |
+ int dest_top, |
+ int dest_width, |
+ int dest_height, |
+ const FX_RECT* pClipRect, |
+ uint32_t flags, |
+ int blend_type) override; |
+ |
+ bool StartDIBits(const CFX_DIBSource* pBitmap, |
+ int bitmap_alpha, |
+ uint32_t color, |
+ const CFX_Matrix* pMatrix, |
+ uint32_t flags, |
+ void*& handle, |
+ int blend_type) override; |
- FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override; |
+ bool ContinueDIBits(void* handle, IFX_Pause* pPause) override; |
void CancelDIBits(void* handle) override {} |
@@ -118,18 +118,18 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { |
const CFX_Matrix* pMatrix, |
int blend_type); |
- FX_BOOL DrawDeviceText(int nChars, |
- const FXTEXT_CHARPOS* pCharPos, |
- CFX_Font* pFont, |
- const CFX_Matrix* pObject2Device, |
- FX_FLOAT font_size, |
- uint32_t color) override; |
+ bool DrawDeviceText(int nChars, |
+ const FXTEXT_CHARPOS* pCharPos, |
+ CFX_Font* pFont, |
+ const CFX_Matrix* pObject2Device, |
+ FX_FLOAT font_size, |
+ uint32_t color) override; |
- FX_BOOL DrawShading(const CPDF_ShadingPattern* pPattern, |
- const CFX_Matrix* pMatrix, |
- const FX_RECT& clip_rect, |
- int alpha, |
- FX_BOOL bAlphaMode) override; |
+ bool DrawShading(const CPDF_ShadingPattern* pPattern, |
+ const CFX_Matrix* pMatrix, |
+ const FX_RECT& clip_rect, |
+ int alpha, |
+ bool bAlphaMode) override; |
virtual uint8_t* GetBuffer() const; |
@@ -152,7 +152,7 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { |
SkCanvas* m_pCanvas; |
SkPictureRecorder* const m_pRecorder; |
std::unique_ptr<SkiaState> m_pCache; |
- FX_BOOL m_bGroupKnockout; |
+ bool m_bGroupKnockout; |
}; |
#endif // defined(_SKIA_SUPPORT_) |