3 files changed, 58 insertions, 70 deletions
diff --git a/core/fxge/include/cfx_gemodule.h b/core/fxge/include/cfx_gemodule.h
index e6b46de8bc..351c036b52 100644
--- a/core/fxge/include/cfx_gemodule.h
+++ b/core/fxge/include/cfx_gemodule.h
@@ -1,4 +1,4 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/core/fxge/include/cfx_pathdata.h b/core/fxge/include/cfx_pathdata.h
new file mode 100644
index 0000000000..fe95631327
--- /dev/null
+++ b/core/fxge/include/cfx_pathdata.h
@@ -0,0 +1,57 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
+#define CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
+
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
+
+struct FX_PATHPOINT {
+  FX_FLOAT m_PointX;
+  FX_FLOAT m_PointY;
+  int m_Flag;
+};
+
+class CFX_PathData {
+ public:
+  CFX_PathData();
+  CFX_PathData(const CFX_PathData& src);
+  ~CFX_PathData();
+
+  int GetPointCount() const { return m_PointCount; }
+  int GetFlag(int index) const { return m_pPoints[index].m_Flag; }
+  FX_FLOAT GetPointX(int index) const { return m_pPoints[index].m_PointX; }
+  FX_FLOAT GetPointY(int index) const { return m_pPoints[index].m_PointY; }
+  FX_PATHPOINT* GetPoints() const { return m_pPoints; }
+
+  void SetPointCount(int nPoints);
+  void AllocPointCount(int nPoints);
+  void AddPointCount(int addPoints);
+  CFX_FloatRect GetBoundingBox() const;
+  CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const;
+  void Transform(const CFX_Matrix* pMatrix);
+  FX_BOOL IsRect() const;
+  FX_BOOL GetZeroAreaPath(CFX_PathData& NewPath,
+                          CFX_Matrix* pMatrix,
+                          FX_BOOL& bThin,
+                          FX_BOOL bAdjust) const;
+  FX_BOOL IsRect(const CFX_Matrix* pMatrix, CFX_FloatRect* rect) const;
+  void Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix);
+  void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top);
+  void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag);
+  void TrimPoints(int nPoints);
+  void Copy(const CFX_PathData& src);
+
+ private:
+  friend class CPDF_Path;
+
+  int m_PointCount;
+  FX_PATHPOINT* m_pPoints;
+  int m_AllocCount;
+};
+
+#endif  // CORE_FXGE_INCLUDE_CFX_PATHDATA_H_
diff --git a/core/fxge/include/fx_ge.h b/core/fxge/include/fx_ge.h
index 53c6ccb744..fabcee41ad 100644
--- a/core/fxge/include/fx_ge.h
+++ b/core/fxge/include/fx_ge.h
@@ -22,75 +22,6 @@ class CPDF_ShadingPattern;
 class IFX_RenderDeviceDriver;
 class SkPictureRecorder;
 
-struct FX_PATHPOINT {
-  FX_FLOAT m_PointX;
-  FX_FLOAT m_PointY;
-  int m_Flag;
-};
-
-class CFX_ClipRgn {
- public:
-  enum ClipType { RectI, MaskF };
-
-  CFX_ClipRgn(int device_width, int device_height);
-  explicit CFX_ClipRgn(const FX_RECT& rect);
-  CFX_ClipRgn(const CFX_ClipRgn& src);
-  ~CFX_ClipRgn();
-
-  ClipType GetType() const { return m_Type; }
-  const FX_RECT& GetBox() const { return m_Box; }
-  CFX_DIBitmapRef GetMask() const { return m_Mask; }
-
-  void Reset(const FX_RECT& rect);
-  void IntersectRect(const FX_RECT& rect);
-  void IntersectMaskF(int left, int top, CFX_DIBitmapRef Mask);
-
- protected:
-  void IntersectMaskRect(FX_RECT rect, FX_RECT mask_box, CFX_DIBitmapRef Mask);
-
-  ClipType m_Type;
-  FX_RECT m_Box;
-  CFX_DIBitmapRef m_Mask;
-};
-
-class CFX_PathData {
- public:
-  CFX_PathData();
-  CFX_PathData(const CFX_PathData& src);
-  ~CFX_PathData();
-
-  int GetPointCount() const { return m_PointCount; }
-  int GetFlag(int index) const { return m_pPoints[index].m_Flag; }
-  FX_FLOAT GetPointX(int index) const { return m_pPoints[index].m_PointX; }
-  FX_FLOAT GetPointY(int index) const { return m_pPoints[index].m_PointY; }
-  FX_PATHPOINT* GetPoints() const { return m_pPoints; }
-
-  void SetPointCount(int nPoints);
-  void AllocPointCount(int nPoints);
-  void AddPointCount(int addPoints);
-  CFX_FloatRect GetBoundingBox() const;
-  CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const;
-  void Transform(const CFX_Matrix* pMatrix);
-  FX_BOOL IsRect() const;
-  FX_BOOL GetZeroAreaPath(CFX_PathData& NewPath,
-                          CFX_Matrix* pMatrix,
-                          FX_BOOL& bThin,
-                          FX_BOOL bAdjust) const;
-  FX_BOOL IsRect(const CFX_Matrix* pMatrix, CFX_FloatRect* rect) const;
-  void Append(const CFX_PathData* pSrc, const CFX_Matrix* pMatrix);
-  void AppendRect(FX_FLOAT left, FX_FLOAT bottom, FX_FLOAT right, FX_FLOAT top);
-  void SetPoint(int index, FX_FLOAT x, FX_FLOAT y, int flag);
-  void TrimPoints(int nPoints);
-  void Copy(const CFX_PathData& src);
-
- protected:
-  friend class CPDF_Path;
-
-  int m_PointCount;
-  FX_PATHPOINT* m_pPoints;
-  int m_AllocCount;
-};
-
 class CFX_GraphStateData {
  public:
   enum LineCap { LineCapButt = 0, LineCapRound = 1, LineCapSquare = 2 };