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

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

Issue 2302683002: Make StateData private (Closed)
Patch Set: Alphabetical order Created 4 years, 3 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 | « BUILD.gn ('k') | core/fpdfapi/fpdf_page/cpdf_generalstate.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 89c13215aee477cbe0f20eb44606f5f157be4c91..b92f10b0953cf2d0a6763dd98cecb76a2dfa7743 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
@@ -106,10 +106,8 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
break;
case FXBSTR_ID('B', 'M', 0, 0): {
CPDF_Array* pArray = pObject->AsArray();
- CFX_ByteString mode =
- pArray ? pArray->GetStringAt(0) : pObject->GetString();
-
- m_GeneralState.SetBlendMode(mode.AsStringC());
+ m_GeneralState.SetBlendMode(pArray ? pArray->GetStringAt(0)
+ : pObject->GetString());
if (m_GeneralState.GetBlendType() > FXDIB_BLEND_MULTIPLY)
pParser->GetPageObjectHolder()->SetBackgroundAlphaNeeded(TRUE);
break;
@@ -117,8 +115,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS,
case FXBSTR_ID('S', 'M', 'a', 's'):
if (ToDictionary(pObject)) {
m_GeneralState.SetSoftMask(pObject);
- FXSYS_memcpy(m_GeneralState.GetMutableSMaskMatrix(),
- &pParser->GetCurStates()->m_CTM, sizeof(CFX_Matrix));
+ m_GeneralState.SetSMaskMatrix(pParser->GetCurStates()->m_CTM);
} else {
m_GeneralState.SetSoftMask(nullptr);
}
« no previous file with comments | « BUILD.gn ('k') | core/fpdfapi/fpdf_page/cpdf_generalstate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698