diff options
| author | tsepez <tsepez@chromium.org> | 2016-08-26 16:52:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-26 16:52:33 -0700 |
| commit | c10c23a2b1999b1cb0354fd4db9837dc63a3d833 (patch) | |
| tree | 2f5b9f35d372de26476411295120146baa93f5fb /core/fpdfapi/fpdf_page/cpdf_colorstate.cpp | |
| parent | 9ed91376d562f3c6e7ca0a99035a74502f648776 (diff) | |
| download | pdfium-c10c23a2b1999b1cb0354fd4db9837dc63a3d833.tar.xz | |
Add -> operators to CFX_CountRef.chromium/2842
Allows CFX_CountRefs to behave more like pointers.
Rename SetNull() to Clear() for consistency with other ptrs.
Change GetPrivateCopy() into MakePrivateCopy() with no return,
since the -> operators are clearer than getting an object pointer.
Review-Url: https://codereview.chromium.org/2283113002
Diffstat (limited to 'core/fpdfapi/fpdf_page/cpdf_colorstate.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_page/cpdf_colorstate.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp index a2234378eb..a46dea3bb8 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp @@ -13,14 +13,16 @@ void CPDF_ColorState::SetFillColor(CPDF_ColorSpace* pCS, FX_FLOAT* pValue, uint32_t nValues) { - CPDF_ColorStateData* pData = GetPrivateCopy(); + MakePrivateCopy(); + CPDF_ColorStateData* pData = GetObject(); SetColor(pData->m_FillColor, pData->m_FillRGB, pCS, pValue, nValues); } void CPDF_ColorState::SetStrokeColor(CPDF_ColorSpace* pCS, FX_FLOAT* pValue, uint32_t nValues) { - CPDF_ColorStateData* pData = GetPrivateCopy(); + MakePrivateCopy(); + CPDF_ColorStateData* pData = GetObject(); SetColor(pData->m_StrokeColor, pData->m_StrokeRGB, pCS, pValue, nValues); } @@ -45,7 +47,8 @@ void CPDF_ColorState::SetColor(CPDF_Color& color, void CPDF_ColorState::SetFillPattern(CPDF_Pattern* pPattern, FX_FLOAT* pValue, uint32_t nValues) { - CPDF_ColorStateData* pData = GetPrivateCopy(); + MakePrivateCopy(); + CPDF_ColorStateData* pData = GetObject(); pData->m_FillColor.SetValue(pPattern, pValue, nValues); int R, G, B; FX_BOOL ret = pData->m_FillColor.GetRGB(R, G, B); @@ -61,7 +64,8 @@ void CPDF_ColorState::SetFillPattern(CPDF_Pattern* pPattern, void CPDF_ColorState::SetStrokePattern(CPDF_Pattern* pPattern, FX_FLOAT* pValue, uint32_t nValues) { - CPDF_ColorStateData* pData = GetPrivateCopy(); + MakePrivateCopy(); + CPDF_ColorStateData* pData = GetObject(); pData->m_StrokeColor.SetValue(pPattern, pValue, nValues); int R, G, B; FX_BOOL ret = pData->m_StrokeColor.GetRGB(R, G, B); |