Convert Origins to points

This CL converts various OriginX, OriginY pairs into CFX_PointF objects.

Change-Id: I9141f7fc713c710b2014d4fdcdec7dc93501f844
Reviewed-on: https://pdfium-review.googlesource.com/2575
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>

1 files changed, 15 insertions, 0 deletions

diff --git a/core/fxcrt/fx_basic_coords.cpp b/core/fxcrt/fx_basic_coords.cpp
index e8abace53d..c5ee4048a2 100644
--- a/core/fxcrt/fx_basic_coords.cpp
+++ b/core/fxcrt/fx_basic_coords.cpp
@@ -197,6 +197,14 @@ 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);
+}
+
 bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
   CFX_FloatRect n1(*this);
   CFX_FloatRect n2(other_rect);
@@ -377,6 +385,13 @@ void CFX_Matrix::TransformPoint(FX_FLOAT& x, FX_FLOAT& y) const {
   y = fy;
 }
 
+CFX_PointF CFX_Matrix::Transform(const CFX_PointF& p) const {
+  FX_FLOAT x = p.x;
+  FX_FLOAT y = p.y;
+  TransformPoint(x, y);
+  return CFX_PointF(x, y);
+}
+
 void CFX_Matrix::TransformRect(CFX_RectF& rect) const {
   FX_FLOAT right = rect.right(), bottom = rect.bottom();
   TransformRect(rect.left, right, bottom, rect.top);