commit 92bc692fbdeb971c18e7b200a5dd813fa0e18cf7
author Lei Zhang <thestig@chromium.org> Sat Jun 12 02:45:37 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jun 12 02:45:37 2021 +0000
tree 6a5342554cd9751526de6bcc117144fd5f80f390
parent f0ceea1dffbcd8d0ae16138fe7d5794181f8bcdc

Nest FX_PATHPOINT as CFX_Path::Point.

Change-Id: I52bfa00a587d9ce14943587d8933f711513a172e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/81988
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fxge/cfx_path.h

diff --git a/core/fxge/cfx_path.h b/core/fxge/cfx_path.h
index b0560d1..c3a1c53 100644
--- a/core/fxge/cfx_path.h
+++ b/core/fxge/cfx_path.h
@@ -16,24 +16,24 @@
 
 enum class FXPT_TYPE : uint8_t { LineTo, BezierTo, MoveTo };
 
-class FX_PATHPOINT {
- public:
-  FX_PATHPOINT();
-  FX_PATHPOINT(const CFX_PointF& point, FXPT_TYPE type, bool close);
-  FX_PATHPOINT(const FX_PATHPOINT& other);
-  ~FX_PATHPOINT();
-
-  bool IsTypeAndOpen(FXPT_TYPE type) const {
-    return m_Type == type && !m_CloseFigure;
-  }
-
-  CFX_PointF m_Point;
-  FXPT_TYPE m_Type;
-  bool m_CloseFigure;
-};
-
 class CFX_Path {
  public:
+  class Point {
+   public:
+    Point();
+    Point(const CFX_PointF& point, FXPT_TYPE type, bool close);
+    Point(const Point& other);
+    ~Point();
+
+    bool IsTypeAndOpen(FXPT_TYPE type) const {
+      return m_Type == type && !m_CloseFigure;
+    }
+
+    CFX_PointF m_Point;
+    FXPT_TYPE m_Type;
+    bool m_CloseFigure;
+  };
+
   CFX_Path();
   CFX_Path(const CFX_Path& src);
   CFX_Path(CFX_Path&& src) noexcept;
@@ -47,8 +47,8 @@
   }
 
   CFX_PointF GetPoint(int index) const { return m_Points[index].m_Point; }
-  const std::vector<FX_PATHPOINT>& GetPoints() const { return m_Points; }
-  std::vector<FX_PATHPOINT>& GetPoints() { return m_Points; }
+  const std::vector<Point>& GetPoints() const { return m_Points; }
+  std::vector<Point>& GetPoints() { return m_Points; }
 
   CFX_FloatRect GetBoundingBox() const;
   CFX_FloatRect GetBoundingBoxForStrokePath(float line_width,
@@ -67,7 +67,7 @@
   void ClosePath();
 
  private:
-  std::vector<FX_PATHPOINT> m_Points;
+  std::vector<Point> m_Points;
 };
 
 class CFX_RetainablePath final : public Retainable, public CFX_Path {