Make CFX_CountRef<>::m_pObject private, add accessors, fix const-ness.

Hide the CountedObj class from the rest of the code.

Rename GetModify() to GetPrivateCopy(), since it turns out
there are places where we modify a potentially-shared copy.
Add non-const version of GetObject() to permit these.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
index 50fc7789fe..ae75876664 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
@@ -10,7 +10,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 
 void CPDF_TextState::SetFont(CPDF_Font* pFont) {
-  CPDF_TextStateData* pStateData = GetModify();
+  CPDF_TextStateData* pStateData = GetPrivateCopy();
   if (pStateData) {
     CPDF_Document* pDoc = pStateData->m_pDocument;
     CPDF_DocPageData* pPageData = pDoc ? pDoc->GetPageData() : nullptr;
@@ -23,26 +23,26 @@ void CPDF_TextState::SetFont(CPDF_Font* pFont) {
 }
 
 FX_FLOAT CPDF_TextState::GetFontSizeV() const {
-  FX_FLOAT* pMatrix = GetMatrix();
+  const FX_FLOAT* pMatrix = GetMatrix();
   FX_FLOAT unit = FXSYS_sqrt2(pMatrix[1], pMatrix[3]);
   FX_FLOAT size = unit * GetFontSize();
   return (FX_FLOAT)FXSYS_fabs(size);
 }
 
 FX_FLOAT CPDF_TextState::GetFontSizeH() const {
-  FX_FLOAT* pMatrix = GetMatrix();
+  const FX_FLOAT* pMatrix = GetMatrix();
   FX_FLOAT unit = FXSYS_sqrt2(pMatrix[0], pMatrix[2]);
   FX_FLOAT size = unit * GetFontSize();
   return (FX_FLOAT)FXSYS_fabs(size);
 }
 
 FX_FLOAT CPDF_TextState::GetBaselineAngle() const {
-  FX_FLOAT* m_Matrix = GetMatrix();
+  const FX_FLOAT* m_Matrix = GetMatrix();
   return FXSYS_atan2(m_Matrix[2], m_Matrix[0]);
 }
 
 FX_FLOAT CPDF_TextState::GetShearAngle() const {
-  FX_FLOAT* m_Matrix = GetMatrix();
+  const FX_FLOAT* m_Matrix = GetMatrix();
   FX_FLOAT shear_angle = FXSYS_atan2(m_Matrix[1], m_Matrix[3]);
   return GetBaselineAngle() + shear_angle;
 }