Replace wrapper methods in CPDF_Path with -> operator.

These just invoked exaclty the same methodes in the underlying
xxxData class, which we can now do with just a ->()

Move some methods to the xxxData class, where they belong.
In doing so, put MakePrivateCopy() calls at each callsite
for those methods that made a copy.

Review-Url: https://codereview.chromium.org/2286983002

2 files changed, 12 insertions, 19 deletions

diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h
index 33db4d755a..adc7d86f44 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_path.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h
@@ -14,18 +14,6 @@
 
 class CPDF_Path : public CFX_CountRef<CFX_PathData> {
  public:
-  int GetPointCount() const { return GetObject()->GetPointCount(); }
-  int GetFlag(int index) const { return GetObject()->GetFlag(index); }
-  FX_FLOAT GetPointX(int index) const { return GetObject()->GetPointX(index); }
-  FX_FLOAT GetPointY(int index) const { return GetObject()->GetPointY(index); }
-  FX_PATHPOINT* GetPoints() const { return GetObject()->GetPoints(); }
-  CFX_FloatRect GetBoundingBox() const { return GetObject()->GetBoundingBox(); }
-  CFX_FloatRect GetBoundingBox(FX_FLOAT line_width,
-                               FX_FLOAT miter_limit) const {
-    return GetObject()->GetBoundingBox(line_width, miter_limit);
-  }
-
-  FX_BOOL IsRect() const { return GetObject()->IsRect(); }
   void Transform(const CFX_Matrix* pMatrix) {
     MakePrivateCopy();
     GetObject()->Transform(pMatrix);
@@ -33,13 +21,6 @@ class CPDF_Path : public CFX_CountRef<CFX_PathData> {
   void Append(const CPDF_Path& other, const CFX_Matrix* pMatrix) {
     GetObject()->Append(other.GetObject(), pMatrix);
   }
-
-  void AppendRect(FX_FLOAT left,
-                  FX_FLOAT bottom,
-                  FX_FLOAT right,
-                  FX_FLOAT top) {
-    GetObject()->AppendRect(left, bottom, right, top);
-  }
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
index 4e33d5f170..40fa1ea8d3 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h
@@ -34,6 +34,18 @@ class CPDF_TextStateData {
   CPDF_TextStateData(const CPDF_TextStateData& src);
   ~CPDF_TextStateData();
 
+  void SetFont(CPDF_Font* pFont);
+
+  CPDF_Font* GetFont() const { return m_pFont; }
+  FX_FLOAT GetFontSize() const { return m_FontSize; }
+  FX_FLOAT* GetMatrix() { return m_Matrix; }
+  const FX_FLOAT* GetMatrix() const { return m_Matrix; }
+
+  FX_FLOAT GetFontSizeV() const;
+  FX_FLOAT GetFontSizeH() const;
+  FX_FLOAT GetBaselineAngle() const;
+  FX_FLOAT GetShearAngle() const;
+
   CPDF_Font* m_pFont;
   CPDF_Document* m_pDocument;
   FX_FLOAT m_FontSize;