From d24c3a60d0e6e5badef57d3baf55e5c3b6d4882e Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Mon, 29 Aug 2016 14:42:36 -0700
Subject: Revert "Add -> operators to CFX_CountRef."

This reverts commit c10c23a2b1999b1cb0354fd4db9837dc63a3d833.

TBR=dsinclair@chromium.org

Review-Url: https://codereview.chromium.org/2285283003
---
 core/fpdfapi/fpdf_render/fpdf_render.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'core/fpdfapi/fpdf_render/fpdf_render.cpp')

diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index f5ab9696c7..f77e46d923 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -199,16 +199,16 @@ FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext,
       const CPDF_ColorStateData* pParentData =
           pParentState->m_InitialStates.m_ColorState.GetObject();
       if (!pColorData || pColorData->m_FillColor.IsNull()) {
-        m_InitialStates.m_ColorState.MakePrivateCopy();
-        m_InitialStates.m_ColorState->m_FillRGB = pParentData->m_FillRGB;
-        m_InitialStates.m_ColorState->m_FillColor.Copy(
-            &pParentData->m_FillColor);
+        CPDF_ColorStateData* pData =
+            m_InitialStates.m_ColorState.GetPrivateCopy();
+        pData->m_FillRGB = pParentData->m_FillRGB;
+        pData->m_FillColor.Copy(&pParentData->m_FillColor);
       }
       if (!pColorData || pColorData->m_StrokeColor.IsNull()) {
-        m_InitialStates.m_ColorState.MakePrivateCopy();
-        m_InitialStates.m_ColorState->m_StrokeRGB = pParentData->m_FillRGB;
-        m_InitialStates.m_ColorState->m_StrokeColor.Copy(
-            &pParentData->m_StrokeColor);
+        CPDF_ColorStateData* pData =
+            m_InitialStates.m_ColorState.GetPrivateCopy();
+        pData->m_StrokeRGB = pParentData->m_FillRGB;
+        pData->m_StrokeColor.Copy(&pParentData->m_StrokeColor);
       }
     }
   } else {
@@ -579,7 +579,7 @@ void CPDF_RenderStatus::ProcessClipPath(CPDF_ClipPath ClipPath,
   if (!ClipPath) {
     if (m_LastClipPath) {
       m_pDevice->RestoreState(true);
-      m_LastClipPath.Clear();
+      m_LastClipPath.SetNull();
     }
     return;
   }
@@ -921,11 +921,11 @@ CPDF_GraphicStates* CPDF_RenderStatus::CloneObjStates(
                                     ? pSrcStates->m_ColorState.GetStrokeColor()
                                     : pSrcStates->m_ColorState.GetFillColor();
   if (!pObjColor->IsNull()) {
-    pStates->m_ColorState.MakePrivateCopy();
-    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;
+    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;
   }
   return pStates;
 }
-- 
cgit v1.2.3