From 596014357f7cd9ee3245ba8ed52cbc5761151727 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 29 Aug 2016 14:26:57 -0700 Subject: Revert "Replace wrapper methods in CPDF_Path with -> operator." This reverts commit d09a09751f724ecdb1a0bc307447a3d0c212ebff. TBR=dsinclair@chromium.org Review-Url: https://codereview.chromium.org/2291833002 --- core/fpdfapi/fpdf_page/include/cpdf_path.h | 19 +++++++++++++++++++ core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h | 12 ------------ 2 files changed, 19 insertions(+), 12 deletions(-) (limited to 'core/fpdfapi/fpdf_page/include') diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h index adc7d86f44..33db4d755a 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h @@ -14,6 +14,18 @@ class CPDF_Path : public CFX_CountRef { public: + int GetPointCount() const { return GetObject()->GetPointCount(); } + int GetFlag(int index) const { return GetObject()->GetFlag(index); } + FX_FLOAT GetPointX(int index) const { return GetObject()->GetPointX(index); } + FX_FLOAT GetPointY(int index) const { return GetObject()->GetPointY(index); } + FX_PATHPOINT* GetPoints() const { return GetObject()->GetPoints(); } + CFX_FloatRect GetBoundingBox() const { return GetObject()->GetBoundingBox(); } + CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, + FX_FLOAT miter_limit) const { + return GetObject()->GetBoundingBox(line_width, miter_limit); + } + + FX_BOOL IsRect() const { return GetObject()->IsRect(); } void Transform(const CFX_Matrix* pMatrix) { MakePrivateCopy(); GetObject()->Transform(pMatrix); @@ -21,6 +33,13 @@ class CPDF_Path : public CFX_CountRef { void Append(const CPDF_Path& other, const CFX_Matrix* pMatrix) { GetObject()->Append(other.GetObject(), pMatrix); } + + void AppendRect(FX_FLOAT left, + FX_FLOAT bottom, + FX_FLOAT right, + FX_FLOAT top) { + GetObject()->AppendRect(left, bottom, right, top); + } }; #endif // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_ diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h index 40fa1ea8d3..4e33d5f170 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h @@ -34,18 +34,6 @@ class CPDF_TextStateData { CPDF_TextStateData(const CPDF_TextStateData& src); ~CPDF_TextStateData(); - void SetFont(CPDF_Font* pFont); - - CPDF_Font* GetFont() const { return m_pFont; } - FX_FLOAT GetFontSize() const { return m_FontSize; } - FX_FLOAT* GetMatrix() { return m_Matrix; } - const FX_FLOAT* GetMatrix() const { return m_Matrix; } - - FX_FLOAT GetFontSizeV() const; - FX_FLOAT GetFontSizeH() const; - FX_FLOAT GetBaselineAngle() const; - FX_FLOAT GetShearAngle() const; - CPDF_Font* m_pFont; CPDF_Document* m_pDocument; FX_FLOAT m_FontSize; -- cgit v1.2.3