commit ecc1305d0489206f22ae554f044167097c71916f
author Daniel Hosseinian <dhoss@chromium.org> Wed Jul 01 04:50:53 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jul 01 04:50:53 2020 +0000
tree 274ba2cddf085ff5b2afa0e2da8b77cfe4db38e8
parent 394effd3e64b014444f1802c07c15eec302506c6

Encapsulate access to CPDF_TextObject's text rendering mode

CPDF_TextObject::GetTextRenderMode() already exists, so write an
accompanying CPDF_TextObject::SetTextRenderMode() to later abstractify
operations needed when changing the text render mode.

Bug: pdfium:1470
Change-Id: I7680f930c9a3c7b4ebab813deb3818c8611e92c5
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/71093
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>

core/fpdfapi/page/cpdf_textobject.cpp

diff --git a/core/fpdfapi/page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp
index d0cc79c..3872a2c 100644
--- a/core/fpdfapi/page/cpdf_textobject.cpp
+++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -256,6 +256,10 @@
   return m_TextState.GetTextMode();
 }
 
+void CPDF_TextObject::SetTextRenderMode(TextRenderingMode mode) {
+  m_TextState.SetTextMode(mode);
+}
+
 CFX_PointF CPDF_TextObject::CalcPositionData(float horz_scale) {
   float curpos = 0;
   float min_x = 10000 * 1.0f;

core/fpdfapi/page/cpdf_textobject.h

diff --git a/core/fpdfapi/page/cpdf_textobject.h b/core/fpdfapi/page/cpdf_textobject.h
index ad9918e..935fb83 100644
--- a/core/fpdfapi/page/cpdf_textobject.h
+++ b/core/fpdfapi/page/cpdf_textobject.h
@@ -56,6 +56,7 @@
   float GetFontSize() const;
 
   TextRenderingMode GetTextRenderMode() const;
+  void SetTextRenderMode(TextRenderingMode mode);
 
   void SetText(const ByteString& str);
   void SetPosition(const CFX_PointF& pos) { m_Pos = pos; }

fpdfsdk/fpdf_edittext.cpp

diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index 91833d9..fc9780a 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -597,7 +597,7 @@
   CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
   if (!pTextObj)
     return FPDF_TEXTRENDERMODE_UNKNOWN;
-  return static_cast<FPDF_TEXT_RENDERMODE>(pTextObj->m_TextState.GetTextMode());
+  return static_cast<FPDF_TEXT_RENDERMODE>(pTextObj->GetTextRenderMode());
 }
 
 FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
@@ -612,7 +612,6 @@
   if (!pTextObj)
     return false;
 
-  pTextObj->m_TextState.SetTextMode(
-      static_cast<TextRenderingMode>(render_mode));
+  pTextObj->SetTextRenderMode(static_cast<TextRenderingMode>(render_mode));
   return true;
 }