diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-19 14:56:52 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-19 14:56:52 -0700 |
| commit | bf4aa2cc93a67826247e887b2ba26a1b965eb616 (patch) | |
| tree | a1d6336676d6d70467a7fb94aa0e625b1dbc8c25 /core/include | |
| parent | eb6527763171cdb4b0fbfea5a20d691f4d67b660 (diff) | |
| download | pdfium-bf4aa2cc93a67826247e887b2ba26a1b965eb616.tar.xz | |
Revert "Remove FX_Alloc() null checks now that it can't return NULL."
This reverts commit eb6527763171cdb4b0fbfea5a20d691f4d67b660.
Reason for revert: broke javascript tests.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1145843005
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fxcodec/fx_codec_def.h | 1 | ||||
| -rw-r--r-- | core/include/fxge/fx_ge.h | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h index 497d4d8fa6..0d08da699b 100644 --- a/core/include/fxcodec/fx_codec_def.h +++ b/core/include/fxcodec/fx_codec_def.h @@ -13,6 +13,7 @@ enum FXCODEC_STATUS { FXCODEC_STATUS_DECODE_READY, FXCODEC_STATUS_DECODE_TOBECONTINUE, FXCODEC_STATUS_DECODE_FINISH, + FXCODEC_STATUS_ERR_MEMORY, FXCODEC_STATUS_ERR_READ, FXCODEC_STATUS_ERR_FLUSH, FXCODEC_STATUS_ERR_FORMAT, diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 147e24ce1f..f9c4e9b9ae 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -186,9 +186,11 @@ public: return m_pPoints; } - void SetPointCount(int nPoints); - void AllocPointCount(int nPoints); - void AddPointCount(int addPoints); + FX_BOOL SetPointCount(int nPoints); + + FX_BOOL AllocPointCount(int nPoints); + + FX_BOOL AddPointCount(int addPoints); CFX_FloatRect GetBoundingBox() const; @@ -202,14 +204,15 @@ public: FX_BOOL IsRect(const CFX_AffineMatrix* pMatrix, CFX_FloatRect* rect) const; - void Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix); - void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top); + FX_BOOL Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix); + + FX_BOOL AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top); void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag); void TrimPoints(int nPoints); - void Copy(const CFX_PathData &src); + FX_BOOL Copy(const CFX_PathData &src); protected: friend class CPDF_Path; |