diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-13 15:44:23 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-13 22:09:20 +0000 |
| commit | 4797c4240cb9e2d8cd36c583d46cd52ff94af95d (patch) | |
| tree | 0c7e856a1c82812fcc3fa038e07ff4f22e424130 /fpdfsdk/pdfwindow/PWL_Utils.h | |
| parent | 58e4c5ac24a88f83d1ba8277dee87baf4cba36a0 (diff) | |
| download | pdfium-4797c4240cb9e2d8cd36c583d46cd52ff94af95d.tar.xz | |
Convert CFX_FloatPoint to CFX_PointF
The two classes store the same information, remove the CFX_FloatPoint variant.
Change-Id: Ie598c2ba5af04fb2bb3347dd48c30fd5e4845e62
Reviewed-on: https://pdfium-review.googlesource.com/2612
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Utils.h')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Utils.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h index f14c3c7963..f6b51d7098 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/pdfwindow/PWL_Utils.h @@ -74,11 +74,11 @@ T PWL_MAX(const T& i, const T& j) { #define PPBL_LABELLEFTICONRIGHT 5 #define PPBL_LABELOVERICON 6 -class CPWL_Point : public CFX_FloatPoint { +class CPWL_Point : public CFX_PointF { public: CPWL_Point() {} - CPWL_Point(FX_FLOAT fx, FX_FLOAT fy) : CFX_FloatPoint(fx, fy) {} - CPWL_Point(const CPWL_Point& point) : CFX_FloatPoint(point.x, point.y) {} + CPWL_Point(FX_FLOAT fx, FX_FLOAT fy) : CFX_PointF(fx, fy) {} + CPWL_Point(const CPWL_Point& point) : CFX_PointF(point.x, point.y) {} }; enum PWL_PATHDATA_TYPE { @@ -121,9 +121,9 @@ class CPWL_Utils { static CFX_FloatRect OffsetRect(const CFX_FloatRect& rect, FX_FLOAT x, FX_FLOAT y); - static CFX_FloatPoint OffsetPoint(const CFX_FloatPoint& point, - FX_FLOAT x, - FX_FLOAT y); + static CFX_PointF OffsetPoint(const CFX_PointF& point, + FX_FLOAT x, + FX_FLOAT y); static FX_COLORREF PWLColorToFXColor(const CPWL_Color& color, int32_t nTransparancy = 255); static bool IsBlackOrWhite(const CPWL_Color& color); @@ -167,13 +167,13 @@ class CPWL_Utils { const CPWL_Color& crText); static CFX_ByteString GetEditAppStream(CFX_Edit* pEdit, - const CFX_FloatPoint& ptOffset, + const CFX_PointF& ptOffset, const CPVT_WordRange* pRange = nullptr, bool bContinuous = true, uint16_t SubWord = 0); static CFX_ByteString GetEditSelAppStream( CFX_Edit* pEdit, - const CFX_FloatPoint& ptOffset, + const CFX_PointF& ptOffset, const CPVT_WordRange* pRange = nullptr); static CFX_ByteString GetTextAppStream(const CFX_FloatRect& rcBBox, IPVT_FontMap* pFontMap, @@ -202,8 +202,8 @@ class CPWL_Utils { FX_FLOAT fWidth); static void DrawStrokeLine(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CFX_FloatPoint& ptMoveTo, - const CFX_FloatPoint& ptLineTo, + const CFX_PointF& ptMoveTo, + const CFX_PointF& ptLineTo, const FX_COLORREF& color, FX_FLOAT fWidth); static void DrawBorder(CFX_RenderDevice* pDevice, @@ -217,7 +217,7 @@ class CPWL_Utils { int32_t nTransparancy); static void DrawFillArea(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - const CFX_FloatPoint* pPts, + const CFX_PointF* pPts, int32_t nCount, const FX_COLORREF& color); static void DrawShadow(CFX_RenderDevice* pDevice, |