Revert "Use ->() in CPDF_ColorState"

core/fpdfapi/fpdf_page/fpdf_page_parser.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_page/pageint.h"
 
-#include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_edit/include/cpdf_creator.h"
 #include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
 #include "core/fpdfapi/fpdf_page/cpdf_meshstream.h"
 #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
@@ skipping 666 matching lines @@
   m_pCurStates->m_CTM = new_matrix;
   OnChangeTextMatrix();
 }
 
 void CPDF_StreamContentParser::Handle_SetColorSpace_Fill() {
   CPDF_ColorSpace* pCS = FindColorSpace(GetString(0));
   if (!pCS)
     return;
 
   m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->GetFillColor()->SetColorSpace(pCS);
+  m_pCurStates->m_ColorState->m_FillColor.SetColorSpace(pCS);
 }
 
 void CPDF_StreamContentParser::Handle_SetColorSpace_Stroke() {
   CPDF_ColorSpace* pCS = FindColorSpace(GetString(0));
   if (!pCS)
     return;
 
   m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->GetStrokeColor()->SetColorSpace(pCS);
+  m_pCurStates->m_ColorState->m_StrokeColor.SetColorSpace(pCS);
 }
 
 void CPDF_StreamContentParser::Handle_SetDash() {
   CPDF_Array* pArray = ToArray(GetObject(1));
   if (!pArray)
     return;
 
   m_pCurStates->SetLineDash(pArray, GetNumber(0), 1.0f);
 }
 
@@ skipping 123 matching lines @@
 void CPDF_StreamContentParser::Handle_FillPathOld() {
   AddPathObject(FXFILL_WINDING, FALSE);
 }
 
 void CPDF_StreamContentParser::Handle_EOFillPath() {
   AddPathObject(FXFILL_ALTERNATE, FALSE);
 }
 
 void CPDF_StreamContentParser::Handle_SetGray_Fill() {
   FX_FLOAT value = GetNumber(0);
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetFillColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY), &value, 1);
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY);
+  m_pCurStates->m_ColorState.SetFillColor(pCS, &value, 1);
 }
 
 void CPDF_StreamContentParser::Handle_SetGray_Stroke() {
   FX_FLOAT value = GetNumber(0);
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetStrokeColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY), &value, 1);
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY);
+  m_pCurStates->m_ColorState.SetStrokeColor(pCS, &value, 1);
 }
 
 void CPDF_StreamContentParser::Handle_SetExtendGraphState() {
   CFX_ByteString name = GetString(0);
   CPDF_Dictionary* pGS = ToDictionary(FindResourceObj("ExtGState", name));
   if (!pGS) {
     m_bResourceMissing = TRUE;
     return;
   }
   m_pCurStates->ProcessExtGS(pGS, this);
@@ skipping 27 matching lines @@
   m_pCurStates->m_GraphState.MakePrivateCopy();
   m_pCurStates->m_GraphState->m_LineCap =
       static_cast<CFX_GraphStateData::LineCap>(GetInteger(0));
 }
 
 void CPDF_StreamContentParser::Handle_SetCMYKColor_Fill() {
   if (m_ParamCount != 4)
     return;
 
   FX_FLOAT values[4];
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++) {
     values[i] = GetNumber(3 - i);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetFillColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK), values, 4);
+  }
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK);
+  m_pCurStates->m_ColorState.SetFillColor(pCS, values, 4);
 }
 
 void CPDF_StreamContentParser::Handle_SetCMYKColor_Stroke() {
   if (m_ParamCount != 4)
     return;
 
   FX_FLOAT values[4];
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < 4; i++) {
     values[i] = GetNumber(3 - i);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetStrokeColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK), values, 4);
+  }
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK);
+  m_pCurStates->m_ColorState.SetStrokeColor(pCS, values, 4);
 }
 
 void CPDF_StreamContentParser::Handle_LineTo() {
   if (m_ParamCount != 2)
     return;
 
   AddPathPoint(GetNumber(1), GetNumber(0), FXPT_LINETO);
 }
 
 void CPDF_StreamContentParser::Handle_MoveTo() {
@@ skipping 44 matching lines @@
   AddPathPoint(x + w, y + h, FXPT_LINETO);
   AddPathPoint(x, y + h, FXPT_LINETO);
   AddPathPoint(x, y, FXPT_LINETO | FXPT_CLOSEFIGURE);
 }
 
 void CPDF_StreamContentParser::Handle_SetRGBColor_Fill() {
   if (m_ParamCount != 3)
     return;
 
   FX_FLOAT values[3];
-  for (int i = 0; i < 3; i++)
+  for (int i = 0; i < 3; i++) {
     values[i] = GetNumber(2 - i);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetFillColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), values, 3);
+  }
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
+  m_pCurStates->m_ColorState.SetFillColor(pCS, values, 3);
 }
 
 void CPDF_StreamContentParser::Handle_SetRGBColor_Stroke() {
   if (m_ParamCount != 3)
     return;
 
   FX_FLOAT values[3];
-  for (int i = 0; i < 3; i++)
+  for (int i = 0; i < 3; i++) {
     values[i] = GetNumber(2 - i);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetStrokeColor(
-      CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB), values, 3);
+  }
+  CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
+  m_pCurStates->m_ColorState.SetStrokeColor(pCS, values, 3);
 }
 
 void CPDF_StreamContentParser::Handle_SetRenderIntent() {}
 
 void CPDF_StreamContentParser::Handle_CloseStrokePath() {
   Handle_ClosePath();
   AddPathObject(0, TRUE);
 }
 
 void CPDF_StreamContentParser::Handle_StrokePath() {
   AddPathObject(0, TRUE);
 }
 
 void CPDF_StreamContentParser::Handle_SetColor_Fill() {
   FX_FLOAT values[4];
-  uint32_t nargs = std::min(m_ParamCount, 4u);
-  for (uint32_t i = 0; i < nargs; i++)
+  int nargs = m_ParamCount;
+  if (nargs > 4) {
+    nargs = 4;
+  }
+  for (int i = 0; i < nargs; i++) {
     values[i] = GetNumber(nargs - i - 1);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetFillColor(nullptr, values, nargs);
+  }
+  m_pCurStates->m_ColorState.SetFillColor(nullptr, values, nargs);
 }
 
 void CPDF_StreamContentParser::Handle_SetColor_Stroke() {
   FX_FLOAT values[4];
-  uint32_t nargs = std::min(m_ParamCount, 4u);
-  for (uint32_t i = 0; i < nargs; i++)
+  int nargs = m_ParamCount;
+  if (nargs > 4) {
+    nargs = 4;
+  }
+  for (int i = 0; i < nargs; i++) {
     values[i] = GetNumber(nargs - i - 1);
-
-  m_pCurStates->m_ColorState.MakePrivateCopy();
-  m_pCurStates->m_ColorState->SetStrokeColor(nullptr, values, nargs);
+  }
+  m_pCurStates->m_ColorState.SetStrokeColor(nullptr, values, nargs);
 }
 
 void CPDF_StreamContentParser::Handle_SetColorPS_Fill() {
   CPDF_Object* pLastParam = GetObject(0);
   if (!pLastParam) {
     return;
   }
   uint32_t nargs = m_ParamCount;
   uint32_t nvalues = nargs;
   if (pLastParam->IsName())
     nvalues--;
   FX_FLOAT* values = nullptr;
   if (nvalues) {
     values = FX_Alloc(FX_FLOAT, nvalues);
     for (uint32_t i = 0; i < nvalues; i++) {
       values[i] = GetNumber(nargs - i - 1);
     }
   }
   if (nvalues != nargs) {
     CPDF_Pattern* pPattern = FindPattern(GetString(0), false);
     if (pPattern) {
-      m_pCurStates->m_ColorState.MakePrivateCopy();
-      m_pCurStates->m_ColorState->SetFillPattern(pPattern, values, nvalues);
+      m_pCurStates->m_ColorState.SetFillPattern(pPattern, values, nvalues);
     }
   } else {
-    m_pCurStates->m_ColorState.MakePrivateCopy();
-    m_pCurStates->m_ColorState->SetFillColor(nullptr, values, nvalues);
+    m_pCurStates->m_ColorState.SetFillColor(nullptr, values, nvalues);
   }
   FX_Free(values);
 }
 
 void CPDF_StreamContentParser::Handle_SetColorPS_Stroke() {
   CPDF_Object* pLastParam = GetObject(0);
   if (!pLastParam) {
     return;
   }
   int nargs = m_ParamCount;
   int nvalues = nargs;
   if (pLastParam->IsName())
     nvalues--;
 
   FX_FLOAT* values = nullptr;
   if (nvalues) {
     values = FX_Alloc(FX_FLOAT, nvalues);
     for (int i = 0; i < nvalues; i++) {
       values[i] = GetNumber(nargs - i - 1);
     }
   }
   if (nvalues != nargs) {
     CPDF_Pattern* pPattern = FindPattern(GetString(0), false);
     if (pPattern) {
-      m_pCurStates->m_ColorState.MakePrivateCopy();
-      m_pCurStates->m_ColorState->SetStrokePattern(pPattern, values, nvalues);
+      m_pCurStates->m_ColorState.SetStrokePattern(pPattern, values, nvalues);
     }
   } else {
-    m_pCurStates->m_ColorState.MakePrivateCopy();
-    m_pCurStates->m_ColorState->SetStrokeColor(nullptr, values, nvalues);
+    m_pCurStates->m_ColorState.SetStrokeColor(nullptr, values, nvalues);
   }
   FX_Free(values);
 }
 
 void CPDF_StreamContentParser::Handle_ShadeFill() {
   CPDF_Pattern* pPattern = FindPattern(GetString(0), true);
   if (!pPattern)
     return;
 
   CPDF_ShadingPattern* pShading = pPattern->AsShadingPattern();
@@ skipping 596 matching lines @@
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
     default:
       break;
   }
 }