diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-25 06:54:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-25 06:54:04 -0700 |
| commit | dbb6266b8b87746fc3241ad6802289da6fb10114 (patch) | |
| tree | 6342d4f80802cf8a40a6f2771a2999c034546abf | |
| parent | cae6bdfff7e409312f2f88548be5b30abfa84147 (diff) | |
| download | pdfium-dbb6266b8b87746fc3241ad6802289da6fb10114.tar.xz | |
Tidy up CFX_PathData
Remove friendship with CFX_Path
Pack members tighter on 64-bits.
Review-Url: https://codereview.chromium.org/2275883004
| -rw-r--r-- | core/fpdfapi/fpdf_page/include/cpdf_path.h | 20 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_pathdata.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/include/cfx_pathdata.h | 4 |
3 files changed, 7 insertions, 19 deletions
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h index 39cbd60bd3..0c077bb443 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h @@ -14,29 +14,19 @@ class CPDF_Path : public CFX_CountRef<CFX_PathData> { public: - int GetPointCount() const { return m_pObject->m_PointCount; } - int GetFlag(int index) const { return m_pObject->m_pPoints[index].m_Flag; } - - FX_FLOAT GetPointX(int index) const { - return m_pObject->m_pPoints[index].m_PointX; - } - - FX_FLOAT GetPointY(int index) const { - return m_pObject->m_pPoints[index].m_PointY; - } - - FX_PATHPOINT* GetPoints() const { return m_pObject->m_pPoints; } + int GetPointCount() const { return m_pObject->GetPointCount(); } + int GetFlag(int index) const { return m_pObject->GetFlag(index); } + FX_FLOAT GetPointX(int index) const { return m_pObject->GetPointX(index); } + FX_FLOAT GetPointY(int index) const { return m_pObject->GetPointY(index); } + FX_PATHPOINT* GetPoints() const { return m_pObject->GetPoints(); } CFX_FloatRect GetBoundingBox() const { return m_pObject->GetBoundingBox(); } - CFX_FloatRect GetBoundingBox(FX_FLOAT line_width, FX_FLOAT miter_limit) const { return m_pObject->GetBoundingBox(line_width, miter_limit); } FX_BOOL IsRect() const { return m_pObject->IsRect(); } - void Transform(const CFX_Matrix* pMatrix) { GetModify()->Transform(pMatrix); } - void Append(CPDF_Path src, const CFX_Matrix* pMatrix) { m_pObject->Append(src.m_pObject, pMatrix); } diff --git a/core/fxge/ge/cfx_pathdata.cpp b/core/fxge/ge/cfx_pathdata.cpp index a538cadcaf..969bfc48e8 100644 --- a/core/fxge/ge/cfx_pathdata.cpp +++ b/core/fxge/ge/cfx_pathdata.cpp @@ -10,7 +10,7 @@ #include "third_party/base/numerics/safe_math.h" CFX_PathData::CFX_PathData() - : m_PointCount(0), m_pPoints(nullptr), m_AllocCount(0) {} + : m_PointCount(0), m_AllocCount(0), m_pPoints(nullptr) {} CFX_PathData::~CFX_PathData() { FX_Free(m_pPoints); diff --git a/core/fxge/include/cfx_pathdata.h b/core/fxge/include/cfx_pathdata.h index d77e1da05e..6bc627c84b 100644 --- a/core/fxge/include/cfx_pathdata.h +++ b/core/fxge/include/cfx_pathdata.h @@ -48,11 +48,9 @@ class CFX_PathData { void Copy(const CFX_PathData& src); private: - friend class CPDF_Path; - int m_PointCount; - FX_PATHPOINT* m_pPoints; int m_AllocCount; + FX_PATHPOINT* m_pPoints; }; #endif // CORE_FXGE_INCLUDE_CFX_PATHDATA_H_ |