Revert "Use ->() in CPDF_ColorState"

This reverts commit 91ddd3f7501429222f648b986a99f3959a398889.

Reason for revert: may introduce sublte bugs, more thought required.

TBR=dsinclair@chromium.org

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

1 files changed, 32 insertions, 0 deletions

diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
index b412947183..128d67558d 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h
+++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h
@@ -9,8 +9,40 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h"
 #include "core/fxcrt/include/cfx_count_ref.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/include/fx_system.h"
+
+class CPDF_Color;
+class CPDF_ColorSpace;
+class CPDF_Pattern;
 
 class CPDF_ColorState : public CFX_CountRef<CPDF_ColorStateData> {
+ public:
+  const CPDF_Color* GetFillColor() const {
+    const CPDF_ColorStateData* pData = GetObject();
+    return pData ? &pData->m_FillColor : nullptr;
+  }
+
+  const CPDF_Color* GetStrokeColor() const {
+    const CPDF_ColorStateData* pData = GetObject();
+    return pData ? &pData->m_StrokeColor : nullptr;
+  }
+
+  void SetFillColor(CPDF_ColorSpace* pCS, FX_FLOAT* pValue, uint32_t nValues);
+  void SetStrokeColor(CPDF_ColorSpace* pCS, FX_FLOAT* pValue, uint32_t nValues);
+  void SetFillPattern(CPDF_Pattern* pattern,
+                      FX_FLOAT* pValue,
+                      uint32_t nValues);
+  void SetStrokePattern(CPDF_Pattern* pattern,
+                        FX_FLOAT* pValue,
+                        uint32_t nValues);
+
+ private:
+  void SetColor(CPDF_Color& color,
+                uint32_t& rgb,
+                CPDF_ColorSpace* pCS,
+                FX_FLOAT* pValue,
+                uint32_t nValues);
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_