summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-20 13:05:23 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-20 13:05:23 -0700
commit0d726c0c9931979d9b0594d56b52c861e08e09ba (patch)
tree05f1a5fe612b31075e5141688dcc822e97c97e9a /core
parent8bd542690c3a0f56e20cd46e96c1ed7fed480690 (diff)
downloadpdfium-0d726c0c9931979d9b0594d56b52c861e08e09ba.tar.xz
CPDF_Document friend cleanup
Remove CPDF_Creator and CPDF_Parser as friends of CPDF_Document. Move all member variables to the private section, and add CPDF_TestDocument as a private friend. Review-Url: https://codereview.chromium.org/2349353003
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp8
-rw-r--r--core/fpdfapi/fpdf_parser/include/cpdf_document.h26
2 files changed, 15 insertions, 19 deletions
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index 36f622664d..45b8711efd 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -929,7 +929,7 @@ int32_t CPDF_Creator::WriteIndirectObjectToStream(const CPDF_Object* pObj) {
}
if (pDict) {
- if (pDict == m_pDocument->m_pRootDict || pDict == m_pEncryptDict)
+ if (pDict == m_pDocument->GetRoot() || pDict == m_pEncryptDict)
return 1;
if (pDict->IsSignatureDict())
return 1;
@@ -1749,17 +1749,17 @@ int32_t CPDF_Creator::WriteDoc_Stage4(IFX_Pause* pPause) {
if (m_File.AppendString("\r\n/Root ") < 0) {
return -1;
}
- if (m_File.AppendDWord(m_pDocument->m_pRootDict->GetObjNum()) < 0) {
+ if (m_File.AppendDWord(m_pDocument->GetRoot()->GetObjNum()) < 0) {
return -1;
}
if (m_File.AppendString(" 0 R\r\n") < 0) {
return -1;
}
- if (m_pDocument->m_pInfoDict) {
+ if (m_pDocument->GetInfo()) {
if (m_File.AppendString("/Info ") < 0) {
return -1;
}
- if (m_File.AppendDWord(m_pDocument->m_pInfoDict->GetObjNum()) < 0) {
+ if (m_File.AppendDWord(m_pDocument->GetInfo()->GetObjNum()) < 0) {
return -1;
}
if (m_File.AppendString(" 0 R\r\n") < 0) {
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
index 4bbbb277d4..1cc32dc3b2 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h
@@ -97,9 +97,8 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
FX_BOOL bTranslateName = FALSE);
#endif
- protected:
- friend class CPDF_Creator;
- friend class CPDF_Parser;
+ private:
+ friend class CPDF_TestDocument;
// Retrieve page count information by getting count value from the tree nodes
int RetrievePageCount() const;
@@ -113,6 +112,15 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
int& index,
int level = 0);
CPDF_Object* ParseIndirectObject(uint32_t objnum) override;
+ void LoadDocInternal();
+ size_t CalculateEncodingDict(int charset, CPDF_Dictionary* pBaseDict);
+ CPDF_Dictionary* GetPagesDict() const;
+ CPDF_Dictionary* ProcessbCJK(
+ CPDF_Dictionary* pBaseDict,
+ int charset,
+ FX_BOOL bVert,
+ CFX_ByteString basefont,
+ std::function<void(FX_WCHAR, FX_WCHAR, CPDF_Array*)> Insert);
std::unique_ptr<CPDF_Parser> m_pParser;
CPDF_Dictionary* m_pRootDict;
@@ -125,18 +133,6 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
std::unique_ptr<CPDF_DocRenderData> m_pDocRender;
std::unique_ptr<JBig2_DocumentContext> m_pCodecContext;
std::unique_ptr<CPDF_LinkList> m_pLinksContext;
-
- private:
- void LoadDocInternal();
- size_t CalculateEncodingDict(int charset, CPDF_Dictionary* pBaseDict);
- CPDF_Dictionary* GetPagesDict() const;
- CPDF_Dictionary* ProcessbCJK(
- CPDF_Dictionary* pBaseDict,
- int charset,
- FX_BOOL bVert,
- CFX_ByteString basefont,
- std::function<void(FX_WCHAR, FX_WCHAR, CPDF_Array*)> Insert);
-
CFX_ArrayTemplate<uint32_t> m_PageList;
};