Revert "Use ->() in CPDF_ColorState"

core/fpdfapi/fpdf_render/fpdf_render.cpp

 // Copyright 2014 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_render/render_int.h"
 
 #include <memory>
 
@@ skipping 180 matching lines @@
   m_bLoadMask = bLoadMask;
   m_pFormResource = pFormResource;
   m_pPageResource = m_pContext->GetPageResources();
   if (pInitialStates && !m_pType3Char) {
     m_InitialStates.CopyStates(*pInitialStates);
     if (pParentState) {
       const CPDF_ColorStateData* pColorData =
           m_InitialStates.m_ColorState.GetObject();
       const CPDF_ColorStateData* pParentData =
           pParentState->m_InitialStates.m_ColorState.GetObject();
-      if (!pColorData || pColorData->GetFillColor()->IsNull()) {
+      if (!pColorData || pColorData->m_FillColor.IsNull()) {
         m_InitialStates.m_ColorState.MakePrivateCopy();
-        m_InitialStates.m_ColorState->SetFillRGB(pParentData->GetFillRGB());
-        m_InitialStates.m_ColorState->GetFillColor()->Copy(
-            pParentData->GetFillColor());
+        m_InitialStates.m_ColorState->m_FillRGB = pParentData->m_FillRGB;
+        m_InitialStates.m_ColorState->m_FillColor.Copy(
+            &pParentData->m_FillColor);
       }
-      if (!pColorData || pColorData->GetStrokeColor()->IsNull()) {
+      if (!pColorData || pColorData->m_StrokeColor.IsNull()) {
         m_InitialStates.m_ColorState.MakePrivateCopy();
-        m_InitialStates.m_ColorState->SetStrokeRGB(pParentData->GetFillRGB());
-        m_InitialStates.m_ColorState->GetStrokeColor()->Copy(
-            pParentData->GetStrokeColor());
+        m_InitialStates.m_ColorState->m_StrokeRGB = pParentData->m_FillRGB;
+        m_InitialStates.m_ColorState->m_StrokeColor.Copy(
+            &pParentData->m_StrokeColor);
       }
     }
   } else {
     m_InitialStates.DefaultStates();
   }
   m_pImageRenderer.reset();
   m_Transparency = transparency;
   return TRUE;
 }
 void CPDF_RenderStatus::RenderObjectList(
@@ skipping 285 matching lines @@
   ASSERT(pObj);
   CPDF_DocRenderData* pDocCache = m_pContext->GetDocument()->GetRenderData();
   return pDocCache ? pDocCache->GetTransferFunc(pObj) : nullptr;
 }
 FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj,
                                        FX_BOOL bType3) const {
   const CPDF_ColorStateData* pColorData = pObj->m_ColorState.GetObject();
   if (m_pType3Char && !bType3 &&
       (!m_pType3Char->m_bColored ||
        (m_pType3Char->m_bColored &&
-        (!pColorData || pColorData->GetFillColor()->IsNull())))) {
+        (!pColorData || pColorData->m_FillColor.IsNull())))) {
     return m_T3FillColor;
   }
-  if (!pColorData || pColorData->GetFillColor()->IsNull()) {
+  if (!pColorData || pColorData->m_FillColor.IsNull()) {
     pColorData = m_InitialStates.m_ColorState.GetObject();
   }
-  FX_COLORREF rgb = pColorData->GetFillRGB();
+  FX_COLORREF rgb = pColorData->m_FillRGB;
   if (rgb == (uint32_t)-1) {
     return 0;
   }
   const CPDF_GeneralStateData* pGeneralData = pObj->m_GeneralState.GetObject();
   int alpha;
   if (pGeneralData) {
     alpha = (int32_t)(pGeneralData->m_FillAlpha * 255);
     if (pGeneralData->m_pTR) {
       if (!pGeneralData->m_pTransferFunc) {
         ((CPDF_GeneralStateData*)pGeneralData)->m_pTransferFunc =
             GetTransferFunc(pGeneralData->m_pTR);
       }
       if (pGeneralData->m_pTransferFunc) {
         rgb = pGeneralData->m_pTransferFunc->TranslateColor(rgb);
       }
     }
   } else {
     alpha = 255;
   }
   return m_Options.TranslateColor(ArgbEncode(alpha, rgb));
 }
 FX_ARGB CPDF_RenderStatus::GetStrokeArgb(const CPDF_PageObject* pObj) const {
   const CPDF_ColorStateData* pColorData = pObj->m_ColorState.GetObject();
-  if (m_pType3Char &&
-      (!m_pType3Char->m_bColored ||
-       (m_pType3Char->m_bColored &&
-        (!pColorData || pColorData->GetStrokeColor()->IsNull())))) {
+  if (m_pType3Char && (!m_pType3Char->m_bColored ||
+                       (m_pType3Char->m_bColored &&
+                        (!pColorData || pColorData->m_StrokeColor.IsNull())))) {
     return m_T3FillColor;
   }
-  if (!pColorData || pColorData->GetStrokeColor()->IsNull()) {
+  if (!pColorData || pColorData->m_StrokeColor.IsNull()) {
     pColorData = m_InitialStates.m_ColorState.GetObject();
   }
-  FX_COLORREF rgb = pColorData->GetStrokeRGB();
+  FX_COLORREF rgb = pColorData->m_StrokeRGB;
   if (rgb == (uint32_t)-1) {
     return 0;
   }
   const CPDF_GeneralStateData* pGeneralData = pObj->m_GeneralState.GetObject();
   int alpha;
   if (pGeneralData) {
     alpha = (int32_t)(pGeneralData->m_StrokeAlpha * 255);
     if (pGeneralData->m_pTR) {
       if (!pGeneralData->m_pTransferFunc) {
         ((CPDF_GeneralStateData*)pGeneralData)->m_pTransferFunc =
@@ skipping 345 matching lines @@
 }
 CPDF_GraphicStates* CPDF_RenderStatus::CloneObjStates(
     const CPDF_GraphicStates* pSrcStates,
     FX_BOOL bStroke) {
   if (!pSrcStates) {
     return nullptr;
   }
   CPDF_GraphicStates* pStates = new CPDF_GraphicStates;
   pStates->CopyStates(*pSrcStates);
   const CPDF_Color* pObjColor = bStroke
-                                    ? pSrcStates->m_ColorState->GetStrokeColor()
-                                    : pSrcStates->m_ColorState->GetFillColor();
+                                    ? pSrcStates->m_ColorState.GetStrokeColor()
+                                    : pSrcStates->m_ColorState.GetFillColor();
   if (!pObjColor->IsNull()) {
     pStates->m_ColorState.MakePrivateCopy();
-    pStates->m_ColorState->SetFillRGB(
-        bStroke ? pSrcStates->m_ColorState->GetStrokeRGB()
-                : pSrcStates->m_ColorState->GetFillRGB());
-    pStates->m_ColorState->SetStrokeRGB(pStates->m_ColorState->GetFillRGB());
+    pStates->m_ColorState->m_FillRGB =
+        bStroke ? pSrcStates->m_ColorState->m_StrokeRGB
+                : pSrcStates->m_ColorState->m_FillRGB;
+    pStates->m_ColorState->m_StrokeRGB = pStates->m_ColorState->m_FillRGB;
   }
   return pStates;
 }
 
 CPDF_RenderContext::CPDF_RenderContext(CPDF_Page* pPage)
     : m_pDocument(pPage->m_pDocument),
       m_pPageResources(pPage->m_pPageResources),
       m_pPageCache(pPage->GetRenderCache()) {}
 
 CPDF_RenderContext::CPDF_RenderContext(CPDF_Document* pDoc,
@@ skipping 358 matching lines @@
     m_pDevice->StretchDIBits(m_pBitmapDevice->GetBitmap(), m_Rect.left,
                              m_Rect.top, m_Rect.Width(), m_Rect.Height());
   }
 }
 
 #if defined _SKIA_SUPPORT_
 void CPDF_RenderStatus::DebugVerifyDeviceIsPreMultiplied() const {
   m_pDevice->DebugVerifyBitmapIsPreMultiplied();
 }
 #endif