summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-19 15:19:32 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-19 15:19:32 -0700
commit981a3468319eb24e696bb64ba84d9631fd26f1f7 (patch)
treec1136b807975ccc80199ff6593e69475261c1670 /core/include
parentbf4aa2cc93a67826247e887b2ba26a1b965eb616 (diff)
downloadpdfium-981a3468319eb24e696bb64ba84d9631fd26f1f7.tar.xz
Re-land: Remove FX_Alloc() null checks now that it can't return NULL.
Fixes the ordering of some assignments broken when converting to checked numerics in CFX_PathData::AddPointCount(). Original Review URL: https://codereview.chromium.org/1142713005 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1135893008
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxcodec/fx_codec_def.h1
-rw-r--r--core/include/fxge/fx_ge.h15
2 files changed, 6 insertions, 10 deletions
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h
index 0d08da699b..497d4d8fa6 100644
--- a/core/include/fxcodec/fx_codec_def.h
+++ b/core/include/fxcodec/fx_codec_def.h
@@ -13,7 +13,6 @@ 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 f9c4e9b9ae..147e24ce1f 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -186,11 +186,9 @@ public:
return m_pPoints;
}
- FX_BOOL SetPointCount(int nPoints);
-
- FX_BOOL AllocPointCount(int nPoints);
-
- FX_BOOL AddPointCount(int addPoints);
+ void SetPointCount(int nPoints);
+ void AllocPointCount(int nPoints);
+ void AddPointCount(int addPoints);
CFX_FloatRect GetBoundingBox() const;
@@ -204,15 +202,14 @@ public:
FX_BOOL IsRect(const CFX_AffineMatrix* pMatrix, CFX_FloatRect* rect) const;
- 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 Append(const CFX_PathData* pSrc, const CFX_AffineMatrix* pMatrix);
+ void 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);
- FX_BOOL Copy(const CFX_PathData &src);
+ void Copy(const CFX_PathData &src);
protected:
friend class CPDF_Path;