diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-05-04 17:57:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 17:57:03 -0700 |
| commit | c777f486f84611d2fdd2d03af661b14955f9efb6 (patch) | |
| tree | 679012454d82e885f749d17f75fd12735efec29a /xfa/fwl/lightwidget/cfwl_picturebox.h | |
| parent | 41aad19ba366540bd4efa20a9009ac1c70a81403 (diff) | |
| download | pdfium-c777f486f84611d2fdd2d03af661b14955f9efb6.tar.xz | |
Convert FWL_ERR into an enum class.
This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and
replaces it with FWL_Error as well as the values were the same.
There were many places where we either returned other values for FWL_ERR
results.
This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem
to have messed up the base URL in that one.
TBR=tsepez@chromium.org
Review-Url: https://codereview.chromium.org/1952693003
Diffstat (limited to 'xfa/fwl/lightwidget/cfwl_picturebox.h')
| -rw-r--r-- | xfa/fwl/lightwidget/cfwl_picturebox.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.h b/xfa/fwl/lightwidget/cfwl_picturebox.h index 8fa985acd8..8b0b13de24 100644 --- a/xfa/fwl/lightwidget/cfwl_picturebox.h +++ b/xfa/fwl/lightwidget/cfwl_picturebox.h @@ -14,19 +14,19 @@ class CFWL_PictureBox : public CFWL_Widget { public: static CFWL_PictureBox* Create(); - FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); + FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL); CFX_DIBitmap* GetPicture(); - FWL_ERR SetPicture(CFX_DIBitmap* pBitmap); + FWL_Error SetPicture(CFX_DIBitmap* pBitmap); FX_FLOAT GetRotation(); - FWL_ERR SetRotation(FX_FLOAT fRotation); + FWL_Error SetRotation(FX_FLOAT fRotation); int32_t GetFlipMode(); - FWL_ERR SetFlipMode(int32_t iFlipMode); + FWL_Error SetFlipMode(int32_t iFlipMode); int32_t GetOpacity(); - FWL_ERR SetOpacity(int32_t iOpacity); - FWL_ERR GetScale(FX_FLOAT& fScaleX, FX_FLOAT& fScaleY); - FWL_ERR SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY); - FWL_ERR GetOffset(FX_FLOAT& fx, FX_FLOAT& fy); - FWL_ERR SetOffset(FX_FLOAT fx, FX_FLOAT fy); + FWL_Error SetOpacity(int32_t iOpacity); + FWL_Error GetScale(FX_FLOAT& fScaleX, FX_FLOAT& fScaleY); + FWL_Error SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY); + FWL_Error GetOffset(FX_FLOAT& fx, FX_FLOAT& fy); + FWL_Error SetOffset(FX_FLOAT fx, FX_FLOAT fy); CFWL_PictureBox(); virtual ~CFWL_PictureBox(); @@ -41,13 +41,14 @@ class CFWL_PictureBox : public CFWL_Widget { m_fOffSetY = 0.0f; m_pBitmap = NULL; } - virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); + virtual FWL_Error GetCaption(IFWL_Widget* pWidget, + CFX_WideString& wsCaption); virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget); virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget* pWidget); virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget* pWidget); virtual int32_t GetOpacity(IFWL_Widget* pWidget); virtual int32_t GetFlipMode(IFWL_Widget* pWidget); - virtual FWL_ERR GetMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); + virtual FWL_Error GetMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); CFX_DIBitmap* m_pBitmap; int32_t m_iOpacity; int32_t m_iFlipMode; |