Revert "Replace wrapper methods in CPDF_Path with -> operator."

core/fpdfapi/fpdf_page/cpdf_textobject.cpp

 // 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
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_textobject.h"
 
 #include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
@@ skipping 17 matching lines @@
 }
 
 void CPDF_TextObject::GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const {
   pInfo->m_CharCode =
       m_nChars == 1 ? (uint32_t)(uintptr_t)m_pCharCodes : m_pCharCodes[index];
   pInfo->m_OriginX = index ? m_pCharPos[index - 1] : 0;
   pInfo->m_OriginY = 0;
   if (pInfo->m_CharCode == CPDF_Font::kInvalidCharCode) {
     return;
   }
-  CPDF_Font* pFont = m_TextState->GetFont();
+  CPDF_Font* pFont = m_TextState.GetFont();
   if (!pFont->IsCIDFont()) {
     return;
   }
   if (!pFont->AsCIDFont()->IsVertWriting()) {
     return;
   }
   uint16_t CID = pFont->AsCIDFont()->CIDFromCharCode(pInfo->m_CharCode);
   pInfo->m_OriginY = pInfo->m_OriginX;
   pInfo->m_OriginX = 0;
   short vx, vy;
   pFont->AsCIDFont()->GetVertOrigin(CID, vx, vy);
-  FX_FLOAT fontsize = m_TextState->GetFontSize();
+  FX_FLOAT fontsize = m_TextState.GetFontSize();
   pInfo->m_OriginX -= fontsize * vx / 1000;
   pInfo->m_OriginY -= fontsize * vy / 1000;
 }
 
 int CPDF_TextObject::CountChars() const {
   if (m_nChars == 1) {
     return 1;
   }
   int count = 0;
   for (int i = 0; i < m_nChars; ++i)
@@ skipping 69 matching lines @@
 
 CPDF_PageObject::Type CPDF_TextObject::GetType() const {
   return TEXT;
 }
 
 void CPDF_TextObject::Transform(const CFX_Matrix& matrix) {
   m_TextState.MakePrivateCopy();
   CFX_Matrix text_matrix;
   GetTextMatrix(&text_matrix);
   text_matrix.Concat(matrix);
-  FX_FLOAT* pTextMatrix = m_TextState->GetMatrix();
+  FX_FLOAT* pTextMatrix = m_TextState.GetMatrix();
   pTextMatrix[0] = text_matrix.GetA();
   pTextMatrix[1] = text_matrix.GetC();
   pTextMatrix[2] = text_matrix.GetB();
   pTextMatrix[3] = text_matrix.GetD();
   m_PosX = text_matrix.GetE();
   m_PosY = text_matrix.GetF();
   CalcPositionData(nullptr, nullptr, 0);
 }
 
 bool CPDF_TextObject::IsText() const {
   return true;
 }
 
 CPDF_TextObject* CPDF_TextObject::AsText() {
   return this;
 }
 
 const CPDF_TextObject* CPDF_TextObject::AsText() const {
   return this;
 }
 
 void CPDF_TextObject::GetTextMatrix(CFX_Matrix* pMatrix) const {
-  const FX_FLOAT* pTextMatrix = m_TextState->GetMatrix();
+  const FX_FLOAT* pTextMatrix = m_TextState.GetMatrix();
   pMatrix->Set(pTextMatrix[0], pTextMatrix[2], pTextMatrix[1], pTextMatrix[3],
                m_PosX, m_PosY);
 }
 
 void CPDF_TextObject::SetSegments(const CFX_ByteString* pStrs,
                                   FX_FLOAT* pKerning,
                                   int nsegs) {
   if (m_nChars > 1) {
     FX_Free(m_pCharCodes);
     m_pCharCodes = nullptr;
   }
   FX_Free(m_pCharPos);
   m_pCharPos = nullptr;
-  CPDF_Font* pFont = m_TextState->GetFont();
+  CPDF_Font* pFont = m_TextState.GetFont();
   m_nChars = 0;
   for (int i = 0; i < nsegs; ++i) {
     m_nChars += pFont->CountChar(pStrs[i].c_str(), pStrs[i].GetLength());
   }
   m_nChars += nsegs - 1;
   if (m_nChars > 1) {
     m_pCharCodes = FX_Alloc(uint32_t, m_nChars);
     m_pCharPos = FX_Alloc(FX_FLOAT, m_nChars - 1);
     int index = 0;
     for (int i = 0; i < nsegs; ++i) {
@@ skipping 14 matching lines @@
         pStrs[0].c_str(), pStrs[0].GetLength(), offset);
   }
 }
 
 void CPDF_TextObject::SetText(const CFX_ByteString& str) {
   SetSegments(&str, nullptr, 1);
   RecalcPositionData();
 }
 
 FX_FLOAT CPDF_TextObject::GetCharWidth(uint32_t charcode) const {
-  FX_FLOAT fontsize = m_TextState->GetFontSize() / 1000;
-  CPDF_Font* pFont = m_TextState->GetFont();
+  FX_FLOAT fontsize = m_TextState.GetFontSize() / 1000;
+  CPDF_Font* pFont = m_TextState.GetFont();
   FX_BOOL bVertWriting = FALSE;
   CPDF_CIDFont* pCIDFont = pFont->AsCIDFont();
   if (pCIDFont) {
     bVertWriting = pCIDFont->IsVertWriting();
   }
   if (!bVertWriting)
     return pFont->GetCharWidthF(charcode, 0) * fontsize;
 
   uint16_t CID = pCIDFont->CIDFromCharCode(charcode);
   return pCIDFont->GetVertWidth(CID) * fontsize;
 }
 
 FX_FLOAT CPDF_TextObject::GetPosX() const {
   return m_PosX;
 }
 
 FX_FLOAT CPDF_TextObject::GetPosY() const {
   return m_PosY;
 }
 
 CPDF_Font* CPDF_TextObject::GetFont() const {
-  return m_TextState->GetFont();
+  return m_TextState.GetFont();
 }
 
 FX_FLOAT CPDF_TextObject::GetFontSize() const {
-  return m_TextState->GetFontSize();
+  return m_TextState.GetFontSize();
 }
 
 void CPDF_TextObject::CalcPositionData(FX_FLOAT* pTextAdvanceX,
                                        FX_FLOAT* pTextAdvanceY,
                                        FX_FLOAT horz_scale,
                                        int level) {
   FX_FLOAT curpos = 0;
   FX_FLOAT min_x = 10000 * 1.0f;
   FX_FLOAT max_x = -10000 * 1.0f;
   FX_FLOAT min_y = 10000 * 1.0f;
   FX_FLOAT max_y = -10000 * 1.0f;
-  CPDF_Font* pFont = m_TextState->GetFont();
+  CPDF_Font* pFont = m_TextState.GetFont();
   FX_BOOL bVertWriting = FALSE;
   CPDF_CIDFont* pCIDFont = pFont->AsCIDFont();
   if (pCIDFont) {
     bVertWriting = pCIDFont->IsVertWriting();
   }
-  FX_FLOAT fontsize = m_TextState->GetFontSize();
+  FX_FLOAT fontsize = m_TextState.GetFontSize();
   for (int i = 0; i < m_nChars; ++i) {
     uint32_t charcode =
         m_nChars == 1 ? (uint32_t)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
     if (i > 0) {
       if (charcode == CPDF_Font::kInvalidCharCode) {
         curpos -= (m_pCharPos[i - 1] * fontsize) / 1000;
         continue;
       }
       m_pCharPos[i - 1] = curpos;
     }
@@ skipping 112 matching lines @@
   m_PosY = y;
   m_Left += dx;
   m_Right += dx;
   m_Top += dy;
   m_Bottom += dy;
 }
 
 void CPDF_TextObject::RecalcPositionData() {
   CalcPositionData(nullptr, nullptr, 1);
 }