diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 11:52:07 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 18:12:34 +0000 |
| commit | f528eee136a602643a7777d87a2cce52cf83f38a (patch) | |
| tree | 94643b8f0b26a8cd61437db4b9867b9a60a00ef8 /core/fxcrt/fx_coordinates.h | |
| parent | 22da8c268d2228203b40a8c73a2d3f6c25fc9acc (diff) | |
| download | pdfium-f528eee136a602643a7777d87a2cce52cf83f38a.tar.xz | |
Reland "Convert CFX_FloatPoint to CFX_PointF"
This CL updates the CFX_FloatPoint Cl to accommodate for the Origin CL being
reverted.
Change-Id: I345fe1117938a49ad9ee5f310fe7b5e21d9f1948
Reviewed-on: https://pdfium-review.googlesource.com/2697
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/fx_coordinates.h')
| -rw-r--r-- | core/fxcrt/fx_coordinates.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h index c9e5433226..12640216ee 100644 --- a/core/fxcrt/fx_coordinates.h +++ b/core/fxcrt/fx_coordinates.h @@ -245,21 +245,6 @@ struct FX_RECT { int32_t bottom; }; -// LBRT rectangles (y-axis runs upwards). -class CFX_FloatPoint { - public: - CFX_FloatPoint() : x(0.0f), y(0.0f) {} - CFX_FloatPoint(FX_FLOAT xx, FX_FLOAT yy) : x(xx), y(yy) {} - - bool operator==(const CFX_FloatPoint& that) const { - return x == that.x && y == that.y; - } - bool operator!=(const CFX_FloatPoint& that) const { return !(*this == that); } - - FX_FLOAT x; - FX_FLOAT y; -}; - // LTWH rectangles (y-axis runs downwards). template <class BaseType> class CFX_RTemplate { @@ -495,6 +480,8 @@ class CFX_FloatRect { } bool IsEmpty() const { return left >= right || bottom >= top; } + + bool Contains(const CFX_PointF& point) const; bool Contains(const CFX_FloatRect& other_rect) const; bool Contains(FX_FLOAT x, FX_FLOAT y) const; |