Make CPDF_ColorState have a CFX_ColorStateData rather than inheriting

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 176 matching lines @@
   m_bStdCS = bStdCS;
   m_T3FillColor = fill_color;
   m_pType3Char = pType3Char;
   m_GroupFamily = GroupFamily;
   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->m_FillColor.IsNull()) {
-        CPDF_ColorStateData* pData =
-            m_InitialStates.m_ColorState.GetPrivateCopy();
-        pData->m_FillRGB = pParentData->m_FillRGB;
-        pData->m_FillColor.Copy(&pParentData->m_FillColor);
+      if (!m_InitialStates.m_ColorState.HasFillColor()) {
+        m_InitialStates.m_ColorState.SetFillRGB(
+            pParentState->m_InitialStates.m_ColorState.GetFillRGB());
+        m_InitialStates.m_ColorState.GetMutableFillColor()->Copy(
+            pParentState->m_InitialStates.m_ColorState.GetFillColor());
       }
-      if (!pColorData || pColorData->m_StrokeColor.IsNull()) {
-        CPDF_ColorStateData* pData =
-            m_InitialStates.m_ColorState.GetPrivateCopy();
-        pData->m_StrokeRGB = pParentData->m_FillRGB;
-        pData->m_StrokeColor.Copy(&pParentData->m_StrokeColor);
+      if (!m_InitialStates.m_ColorState.HasStrokeColor()) {
+        m_InitialStates.m_ColorState.SetStrokeRGB(
+            pParentState->m_InitialStates.m_ColorState.GetFillRGB());
+        m_InitialStates.m_ColorState.GetMutableStrokeColor()->Copy(
+            pParentState->m_InitialStates.m_ColorState.GetStrokeColor());
       }
     }
   } else {
     m_InitialStates.DefaultStates();
   }
   m_pImageRenderer.reset();
   m_Transparency = transparency;
   return TRUE;
 }
 void CPDF_RenderStatus::RenderObjectList(
@@ skipping 683 matching lines @@
   CFX_FxgeDevice device;
   device.Attach(pBuffer, false, nullptr, false);
 
   FX_RECT rect(0, 0, device.GetWidth(), device.GetHeight());
   device.FillRect(&rect, 0xffffffff);
   Render(&device, pObj, pOptions, pFinalMatrix);
 }
 CPDF_GraphicStates* CPDF_RenderStatus::CloneObjStates(
     const CPDF_GraphicStates* pSrcStates,
     FX_BOOL bStroke) {
-  if (!pSrcStates) {
+  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();
   if (!pObjColor->IsNull()) {
-    CPDF_ColorStateData* pColorData = pStates->m_ColorState.GetPrivateCopy();
-    pColorData->m_FillRGB =
-        bStroke ? pSrcStates->m_ColorState.GetObject()->m_StrokeRGB
-                : pSrcStates->m_ColorState.GetObject()->m_FillRGB;
-    pColorData->m_StrokeRGB = pColorData->m_FillRGB;
+    pStates->m_ColorState.SetFillRGB(
+        bStroke ? pSrcStates->m_ColorState.GetStrokeRGB()
+                : pSrcStates->m_ColorState.GetFillRGB());
+    pStates->m_ColorState.SetStrokeRGB(pStates->m_ColorState.GetFillRGB());
   }
   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