Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1663)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fpdfapi/fpdf_page/cpdf_allstates.cpp

Issue 2283113002: Add -> operators to CFX_CountRef. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@privatize
Patch Set: Regenerate patch, rebase off of master. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | core/fpdfapi/fpdf_page/cpdf_clippath.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/fpdf_page/cpdf_allstates.cpp
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
index e4b6e328b9020fed2c1c19dca827d6df2a1c0dba..fb0c2445e7b39edc2d960cec1231e900dfff16c9 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
@@ -45,16 +45,16 @@ void CPDF_AllStates::Copy(const CPDF_AllStates& src) {
void CPDF_AllStates::SetLineDash(CPDF_Array* pArray,
FX_FLOAT phase,
FX_FLOAT scale) {
- CFX_GraphStateData* pData = m_GraphState.GetPrivateCopy();
- pData->m_DashPhase = phase * scale;
- pData->SetDashCount(static_cast<int>(pArray->GetCount()));
+ m_GraphState.MakePrivateCopy();
+ m_GraphState->m_DashPhase = phase * scale;
+ m_GraphState->SetDashCount(static_cast<int>(pArray->GetCount()));
for (size_t i = 0; i < pArray->GetCount(); i++)
- pData->m_DashArray[i] = pArray->GetNumberAt(i) * scale;
+ m_GraphState->m_DashArray[i] = pArray->GetNumberAt(i) * scale;
}
void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
CPDF_StreamContentParser* pParser) {
- CPDF_GeneralStateData* pGeneralState = m_GeneralState.GetPrivateCopy();
+ m_GeneralState.MakePrivateCopy();
for (const auto& it : *pGS) {
const CFX_ByteString& key_str = it.first;
CPDF_Object* pElement = it.second;
@@ -65,18 +65,22 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
uint32_t key = key_str.GetID();
switch (key) {
case FXBSTR_ID('L', 'W', 0, 0):
- m_GraphState.GetPrivateCopy()->m_LineWidth = pObject->GetNumber();
+ m_GraphState.MakePrivateCopy();
+ m_GraphState->m_LineWidth = pObject->GetNumber();
break;
case FXBSTR_ID('L', 'C', 0, 0):
- m_GraphState.GetPrivateCopy()->m_LineCap =
- (CFX_GraphStateData::LineCap)pObject->GetInteger();
+ m_GraphState.MakePrivateCopy();
+ m_GraphState->m_LineCap =
+ static_cast<CFX_GraphStateData::LineCap>(pObject->GetInteger());
break;
case FXBSTR_ID('L', 'J', 0, 0):
- m_GraphState.GetPrivateCopy()->m_LineJoin =
- (CFX_GraphStateData::LineJoin)pObject->GetInteger();
+ m_GraphState.MakePrivateCopy();
+ m_GraphState->m_LineJoin =
+ static_cast<CFX_GraphStateData::LineJoin>(pObject->GetInteger());
break;
case FXBSTR_ID('M', 'L', 0, 0):
- m_GraphState.GetPrivateCopy()->m_MiterLimit = pObject->GetNumber();
+ m_GraphState.MakePrivateCopy();
+ m_GraphState->m_MiterLimit = pObject->GetNumber();
break;
case FXBSTR_ID('D', 0, 0, 0): {
CPDF_Array* pDash = pObject->AsArray();
@@ -98,7 +102,8 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
if (!pFont)
break;
- m_TextState.GetPrivateCopy()->m_FontSize = pFont->GetNumberAt(1);
+ m_TextState.MakePrivateCopy();
+ m_TextState->m_FontSize = pFont->GetNumberAt(1);
m_TextState.SetFont(pParser->FindFont(pFont->GetStringAt(0)));
break;
}
@@ -107,7 +112,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
continue;
}
case FXBSTR_ID('T', 'R', '2', 0):
- pGeneralState->m_pTR =
+ m_GeneralState->m_pTR =
(pObject && !pObject->IsName()) ? pObject : nullptr;
break;
case FXBSTR_ID('B', 'M', 0, 0): {
@@ -115,72 +120,72 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
CFX_ByteString mode =
pArray ? pArray->GetStringAt(0) : pObject->GetString();
- pGeneralState->SetBlendMode(mode.AsStringC());
- if (pGeneralState->m_BlendType > FXDIB_BLEND_MULTIPLY) {
+ m_GeneralState->SetBlendMode(mode.AsStringC());
+ if (m_GeneralState->m_BlendType > FXDIB_BLEND_MULTIPLY) {
pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE);
}
break;
}
case FXBSTR_ID('S', 'M', 'a', 's'):
if (ToDictionary(pObject)) {
- pGeneralState->m_pSoftMask = pObject;
- FXSYS_memcpy(pGeneralState->m_SMaskMatrix,
+ m_GeneralState->m_pSoftMask = pObject;
+ FXSYS_memcpy(m_GeneralState->m_SMaskMatrix,
&pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix));
} else {
- pGeneralState->m_pSoftMask = nullptr;
+ m_GeneralState->m_pSoftMask = nullptr;
}
break;
case FXBSTR_ID('C', 'A', 0, 0):
- pGeneralState->m_StrokeAlpha = ClipFloat(pObject->GetNumber());
+ m_GeneralState->m_StrokeAlpha = ClipFloat(pObject->GetNumber());
break;
case FXBSTR_ID('c', 'a', 0, 0):
- pGeneralState->m_FillAlpha = ClipFloat(pObject->GetNumber());
+ m_GeneralState->m_FillAlpha = ClipFloat(pObject->GetNumber());
break;
case FXBSTR_ID('O', 'P', 0, 0):
- pGeneralState->m_StrokeOP = pObject->GetInteger();
+ m_GeneralState->m_StrokeOP = pObject->GetInteger();
if (!pGS->KeyExist("op")) {
- pGeneralState->m_FillOP = pObject->GetInteger();
+ m_GeneralState->m_FillOP = pObject->GetInteger();
}
break;
case FXBSTR_ID('o', 'p', 0, 0):
- pGeneralState->m_FillOP = pObject->GetInteger();
+ m_GeneralState->m_FillOP = pObject->GetInteger();
break;
case FXBSTR_ID('O', 'P', 'M', 0):
- pGeneralState->m_OPMode = pObject->GetInteger();
+ m_GeneralState->m_OPMode = pObject->GetInteger();
break;
case FXBSTR_ID('B', 'G', 0, 0):
if (pGS->KeyExist("BG2")) {
continue;
}
case FXBSTR_ID('B', 'G', '2', 0):
- pGeneralState->m_pBG = pObject;
+ m_GeneralState->m_pBG = pObject;
break;
case FXBSTR_ID('U', 'C', 'R', 0):
if (pGS->KeyExist("UCR2")) {
continue;
}
case FXBSTR_ID('U', 'C', 'R', '2'):
- pGeneralState->m_pUCR = pObject;
+ m_GeneralState->m_pUCR = pObject;
break;
case FXBSTR_ID('H', 'T', 0, 0):
- pGeneralState->m_pHT = pObject;
+ m_GeneralState->m_pHT = pObject;
break;
case FXBSTR_ID('F', 'L', 0, 0):
- pGeneralState->m_Flatness = pObject->GetNumber();
+ m_GeneralState->m_Flatness = pObject->GetNumber();
break;
case FXBSTR_ID('S', 'M', 0, 0):
- pGeneralState->m_Smoothness = pObject->GetNumber();
+ m_GeneralState->m_Smoothness = pObject->GetNumber();
break;
case FXBSTR_ID('S', 'A', 0, 0):
- pGeneralState->m_StrokeAdjust = pObject->GetInteger();
+ m_GeneralState->m_StrokeAdjust = pObject->GetInteger();
break;
case FXBSTR_ID('A', 'I', 'S', 0):
- pGeneralState->m_AlphaSource = pObject->GetInteger();
+ m_GeneralState->m_AlphaSource = pObject->GetInteger();
break;
case FXBSTR_ID('T', 'K', 0, 0):
- pGeneralState->m_TextKnockout = pObject->GetInteger();
+ m_GeneralState->m_TextKnockout = pObject->GetInteger();
break;
}
}
- pGeneralState->m_Matrix = m_CTM;
+ m_GeneralState->m_Matrix = m_CTM;
}
« no previous file with comments | « no previous file | core/fpdfapi/fpdf_page/cpdf_clippath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698