diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:17:56 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:17:56 -0800 |
| commit | 566b974287ce0e81a963138152b8898f22480f52 (patch) | |
| tree | b85991aee92475549d84e8cb68702960b85d1252 /core/include/fpdfdoc | |
| parent | 3b8fdd34bdf57ec45291b77008a43249f838efcb (diff) | |
| download | pdfium-566b974287ce0e81a963138152b8898f22480f52.tar.xz | |
Revert "Replace CPDF_Rect and CPDF_Point with CFX types."
This reverts commit 3b8fdd34bdf57ec45291b77008a43249f838efcb.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1743753002 .
Diffstat (limited to 'core/include/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_ap.h | 4 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_vt.h | 21 |
2 files changed, 12 insertions, 13 deletions
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index 5f2a3005ea..f9ade57d97 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -81,12 +81,12 @@ class CPVT_GenerateAP { static CFX_ByteString GenerateEditAP(IPVT_FontMap* pFontMap, IPDF_VariableText_Iterator* pIterator, - const CFX_FloatPoint& ptOffset, + const CPDF_Point& ptOffset, FX_BOOL bContinuous, FX_WORD SubWord = 0, const CPVT_WordRange* pVisible = NULL); - static CFX_ByteString GenerateBorderAP(const CFX_FloatRect& rect, + static CFX_ByteString GenerateBorderAP(const CPDF_Rect& rect, FX_FLOAT fWidth, const CPVT_Color& color, const CPVT_Color& crLeftTop, diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h index b2e64cd2ed..91a93884e8 100644 --- a/core/include/fpdfdoc/fpdf_vt.h +++ b/core/include/fpdfdoc/fpdf_vt.h @@ -226,7 +226,7 @@ struct CPVT_Word { CPVT_WordPlace WordPlace; - CFX_FloatPoint ptWord; + CPDF_Point ptWord; FX_FLOAT fAscent; @@ -248,7 +248,7 @@ struct CPVT_Line { CPVT_WordPlace lineEnd; - CFX_FloatPoint ptLine; + CPDF_Point ptLine; FX_FLOAT fLineWidth; @@ -259,7 +259,7 @@ struct CPVT_Line { struct CPVT_Section { CPVT_WordPlace secplace; - CFX_FloatRect rcSection; + CPDF_Rect rcSection; CPVT_SecProps SecProps; @@ -328,7 +328,7 @@ class IPDF_VariableText { virtual IPDF_VariableText_Iterator* GetIterator() = 0; - virtual void SetPlateRect(const CFX_FloatRect& rect) = 0; + virtual void SetPlateRect(const CPDF_Rect& rect) = 0; virtual void SetAlignment(int32_t nFormat = 0) = 0; @@ -395,9 +395,9 @@ class IPDF_VariableText { virtual CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place) = 0; - virtual const CFX_FloatRect& GetPlateRect() const = 0; + virtual const CPDF_Rect& GetPlateRect() const = 0; - virtual CFX_FloatRect GetContentRect() const = 0; + virtual CPDF_Rect GetContentRect() const = 0; virtual int32_t GetTotalWords() const = 0; @@ -427,14 +427,13 @@ class IPDF_VariableText { virtual CPVT_WordPlace GetNextWordPlace( const CPVT_WordPlace& place) const = 0; - virtual CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const = 0; + virtual CPVT_WordPlace SearchWordPlace(const CPDF_Point& point) const = 0; virtual CPVT_WordPlace GetUpWordPlace(const CPVT_WordPlace& place, - const CFX_FloatPoint& point) const = 0; + const CPDF_Point& point) const = 0; - virtual CPVT_WordPlace GetDownWordPlace( - const CPVT_WordPlace& place, - const CFX_FloatPoint& point) const = 0; + virtual CPVT_WordPlace GetDownWordPlace(const CPVT_WordPlace& place, + const CPDF_Point& point) const = 0; virtual CPVT_WordPlace GetLineBeginPlace( const CPVT_WordPlace& place) const = 0; |