summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-05-07 23:28:36 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-07 23:28:36 +0000
commit4c31a13a704850fdf301fb561ba966baa3c7c29c (patch)
tree6d7a7d667008b673d0ccb8047392956b9e8cb32d /core
parent0cc77c9ef74f527a6887d9a2e8ebcb6412615f30 (diff)
downloadpdfium-4c31a13a704850fdf301fb561ba966baa3c7c29c.tar.xz
Make CPDF_PageObjectHolder::m_iTransparency protected.
Also initialize members in the header. Change-Id: Id814c4c5042c9d4989fa92b78f68c17f4949f09d Reviewed-on: https://pdfium-review.googlesource.com/32111 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/page/cpdf_contentparser.cpp2
-rw-r--r--core/fpdfapi/page/cpdf_pageobjectholder.cpp9
-rw-r--r--core/fpdfapi/page/cpdf_pageobjectholder.h6
3 files changed, 5 insertions, 12 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp
index 08923f38b6..0b11da5554 100644
--- a/core/fpdfapi/page/cpdf_contentparser.cpp
+++ b/core/fpdfapi/page/cpdf_contentparser.cpp
@@ -93,7 +93,7 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm,
m_pParser->GetCurStates()->m_ClipPath.AppendPath(ClipPath, FXFILL_WINDING,
true);
}
- if (pForm->m_iTransparency & PDFTRANS_GROUP) {
+ if (pForm->GetTransparency() & PDFTRANS_GROUP) {
CPDF_GeneralState* pState = &m_pParser->GetCurStates()->m_GeneralState;
pState->SetBlendType(FXDIB_BLEND_NORMAL);
pState->SetStrokeAlpha(1.0f);
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
index 06fb3f26ea..5bf627ace3 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.cpp
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
@@ -16,14 +16,7 @@
CPDF_PageObjectHolder::CPDF_PageObjectHolder(CPDF_Document* pDoc,
CPDF_Dictionary* pFormDict)
- : m_pFormDict(pFormDict),
- m_pFormStream(nullptr),
- m_pDocument(pDoc),
- m_pPageResources(nullptr),
- m_pResources(nullptr),
- m_iTransparency(0),
- m_bBackgroundAlphaNeeded(false),
- m_ParseState(CONTENT_NOT_PARSED) {
+ : m_pFormDict(pFormDict), m_pDocument(pDoc) {
// TODO(thestig): Check if |m_pFormDict| is never a nullptr and simplify
// callers that checks for that.
}
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h
index febc53e410..98cd97adb2 100644
--- a/core/fpdfapi/page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -95,16 +95,16 @@ class CPDF_PageObjectHolder {
std::map<GraphicsData, ByteString> m_GraphicsMap;
std::map<FontData, ByteString> m_FontsMap;
CFX_FloatRect m_BBox;
- int m_iTransparency;
protected:
enum ParseState { CONTENT_NOT_PARSED, CONTENT_PARSING, CONTENT_PARSED };
void LoadTransInfo();
- bool m_bBackgroundAlphaNeeded;
+ int m_iTransparency = 0;
+ bool m_bBackgroundAlphaNeeded = false;
std::vector<CFX_FloatRect> m_MaskBoundingBoxes;
- ParseState m_ParseState;
+ ParseState m_ParseState = CONTENT_NOT_PARSED;
std::unique_ptr<CPDF_ContentParser> m_pParser;
CPDF_PageObjectList m_PageObjectList;
CFX_Matrix m_LastCTM;