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 /core/fxcrt | |
| 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 'core/fxcrt')
| -rw-r--r-- | core/fxcrt/fx_basic_coords.cpp | 4 | ||||
| -rw-r--r-- | core/fxcrt/fx_coordinates.h | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp index c5ee4048a2..35364e8030 100644 --- a/core/fxcrt/fx_basic_coords.cpp +++ b/core/fxcrt/fx_basic_coords.cpp @@ -197,10 +197,6 @@ FX_RECT CFX_FloatRect::GetClosestRect() const { return rect; } -bool CFX_FloatRect::Contains(const CFX_FloatPoint& point) const { - return Contains(point.x, point.y); -} - bool CFX_FloatRect::Contains(const CFX_PointF& point) const { return Contains(point.x, point.y); } diff --git a/core/fxcrt/fx_coordinates.h b/core/fxcrt/fx_coordinates.h index 172d794e97..3a5b1feabe 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,7 +480,6 @@ class CFX_FloatRect { } bool IsEmpty() const { return left >= right || bottom >= top; } - bool Contains(const CFX_FloatPoint& point) const; bool Contains(const CFX_PointF& point) const; bool Contains(const CFX_FloatRect& other_rect) const; bool Contains(FX_FLOAT x, FX_FLOAT y) const; |