From bf4aa2cc93a67826247e887b2ba26a1b965eb616 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 19 May 2015 14:56:52 -0700 Subject: 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 --- core/include/fxge/fx_ge.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'core/include/fxge') 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; -- cgit v1.2.3