| Index: xfa/fde/fde_gedevice.h
|
| diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h
|
| index d290f166a89e7f738615f3f9ff24062b37bdde35..cb8e3fa42a72ce0da2f96b01112de90e981e217c 100644
|
| --- a/xfa/fde/fde_gedevice.h
|
| +++ b/xfa/fde/fde_gedevice.h
|
| @@ -18,108 +18,108 @@ class CFX_GraphStateData;
|
|
|
| class CFDE_RenderDevice : public CFX_Target {
|
| public:
|
| - CFDE_RenderDevice(CFX_RenderDevice* pDevice, FX_BOOL bOwnerDevice);
|
| + CFDE_RenderDevice(CFX_RenderDevice* pDevice, bool bOwnerDevice);
|
| ~CFDE_RenderDevice() override;
|
|
|
| int32_t GetWidth() const;
|
| int32_t GetHeight() const;
|
| void SaveState();
|
| void RestoreState();
|
| - FX_BOOL SetClipPath(const CFDE_Path* pClip);
|
| + bool SetClipPath(const CFDE_Path* pClip);
|
| CFDE_Path* GetClipPath() const;
|
| - FX_BOOL SetClipRect(const CFX_RectF& rtClip);
|
| + bool SetClipRect(const CFX_RectF& rtClip);
|
| const CFX_RectF& GetClipRect();
|
|
|
| FX_FLOAT GetDpiX() const;
|
| FX_FLOAT GetDpiY() const;
|
|
|
| - FX_BOOL DrawImage(CFX_DIBSource* pDib,
|
| - const CFX_RectF* pSrcRect,
|
| - const CFX_RectF& dstRect,
|
| - const CFX_Matrix* pImgMatrix = nullptr,
|
| - const CFX_Matrix* pDevMatrix = nullptr);
|
| - FX_BOOL DrawString(CFDE_Brush* pBrush,
|
| - CFGAS_GEFont* pFont,
|
| - const FXTEXT_CHARPOS* pCharPos,
|
| - int32_t iCount,
|
| - FX_FLOAT fFontSize,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawBezier(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_PointF& pt1,
|
| - const CFX_PointF& pt2,
|
| - const CFX_PointF& pt3,
|
| - const CFX_PointF& pt4,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawCurve(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_PointsF& points,
|
| - FX_BOOL bClosed,
|
| - FX_FLOAT fTension = 0.5f,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawEllipse(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_RectF& rect,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawLines(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_PointsF& points,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawLine(CFDE_Pen* pPen,
|
| + bool DrawImage(CFX_DIBSource* pDib,
|
| + const CFX_RectF* pSrcRect,
|
| + const CFX_RectF& dstRect,
|
| + const CFX_Matrix* pImgMatrix = nullptr,
|
| + const CFX_Matrix* pDevMatrix = nullptr);
|
| + bool DrawString(CFDE_Brush* pBrush,
|
| + CFGAS_GEFont* pFont,
|
| + const FXTEXT_CHARPOS* pCharPos,
|
| + int32_t iCount,
|
| + FX_FLOAT fFontSize,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawBezier(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFX_PointF& pt1,
|
| + const CFX_PointF& pt2,
|
| + const CFX_PointF& pt3,
|
| + const CFX_PointF& pt4,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawCurve(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFX_PointsF& points,
|
| + bool bClosed,
|
| + FX_FLOAT fTension = 0.5f,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawEllipse(CFDE_Pen* pPen,
|
| FX_FLOAT fPenWidth,
|
| - const CFX_PointF& pt1,
|
| - const CFX_PointF& pt2,
|
| + const CFX_RectF& rect,
|
| const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawPath(CFDE_Pen* pPen,
|
| + bool DrawLines(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFX_PointsF& points,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawLine(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFX_PointF& pt1,
|
| + const CFX_PointF& pt2,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawPath(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFDE_Path* pPath,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool DrawPolygon(CFDE_Pen* pPen,
|
| FX_FLOAT fPenWidth,
|
| - const CFDE_Path* pPath,
|
| + const CFX_PointsF& points,
|
| const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawPolygon(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_PointsF& points,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL DrawRectangle(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - const CFX_RectF& rect,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL FillClosedCurve(CFDE_Brush* pBrush,
|
| - const CFX_PointsF& points,
|
| - FX_FLOAT fTension = 0.5f,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL FillEllipse(CFDE_Brush* pBrush,
|
| - const CFX_RectF& rect,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL FillPath(CFDE_Brush* pBrush,
|
| - const CFDE_Path* pPath,
|
| + bool DrawRectangle(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + const CFX_RectF& rect,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool FillClosedCurve(CFDE_Brush* pBrush,
|
| + const CFX_PointsF& points,
|
| + FX_FLOAT fTension = 0.5f,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool FillEllipse(CFDE_Brush* pBrush,
|
| + const CFX_RectF& rect,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool FillPath(CFDE_Brush* pBrush,
|
| + const CFDE_Path* pPath,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
| + bool FillPolygon(CFDE_Brush* pBrush,
|
| + const CFX_PointsF& points,
|
| const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL FillPolygon(CFDE_Brush* pBrush,
|
| - const CFX_PointsF& points,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| - FX_BOOL FillRectangle(CFDE_Brush* pBrush,
|
| - const CFX_RectF& rect,
|
| - const CFX_Matrix* pMatrix = nullptr);
|
| + bool FillRectangle(CFDE_Brush* pBrush,
|
| + const CFX_RectF& rect,
|
| + const CFX_Matrix* pMatrix = nullptr);
|
|
|
| - FX_BOOL DrawSolidString(CFDE_Brush* pBrush,
|
| - CFGAS_GEFont* pFont,
|
| - const FXTEXT_CHARPOS* pCharPos,
|
| - int32_t iCount,
|
| - FX_FLOAT fFontSize,
|
| - const CFX_Matrix* pMatrix);
|
| - FX_BOOL DrawStringPath(CFDE_Brush* pBrush,
|
| - CFGAS_GEFont* pFont,
|
| - const FXTEXT_CHARPOS* pCharPos,
|
| - int32_t iCount,
|
| - FX_FLOAT fFontSize,
|
| - const CFX_Matrix* pMatrix);
|
| + bool DrawSolidString(CFDE_Brush* pBrush,
|
| + CFGAS_GEFont* pFont,
|
| + const FXTEXT_CHARPOS* pCharPos,
|
| + int32_t iCount,
|
| + FX_FLOAT fFontSize,
|
| + const CFX_Matrix* pMatrix);
|
| + bool DrawStringPath(CFDE_Brush* pBrush,
|
| + CFGAS_GEFont* pFont,
|
| + const FXTEXT_CHARPOS* pCharPos,
|
| + int32_t iCount,
|
| + FX_FLOAT fFontSize,
|
| + const CFX_Matrix* pMatrix);
|
|
|
| protected:
|
| - FX_BOOL CreatePen(CFDE_Pen* pPen,
|
| - FX_FLOAT fPenWidth,
|
| - CFX_GraphStateData& graphState);
|
| + bool CreatePen(CFDE_Pen* pPen,
|
| + FX_FLOAT fPenWidth,
|
| + CFX_GraphStateData& graphState);
|
|
|
| CFX_RenderDevice* const m_pDevice;
|
| CFX_RectF m_rtClip;
|
| - FX_BOOL m_bOwnerDevice;
|
| + bool m_bOwnerDevice;
|
| int32_t m_iCharCount;
|
| };
|
|
|
|
|