summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_page
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-01-21 16:09:36 -0800
committerTom Sepez <tsepez@chromium.org>2016-01-21 16:09:36 -0800
commit8139bc147f6936d490d2e47632213ec13251e925 (patch)
tree881be2d42955320a6f296c9558c11804f1edb71a /core/src/fpdfapi/fpdf_page
parentb5b2a9162e3e5d17b233d912399daca9be5ed51b (diff)
downloadpdfium-8139bc147f6936d490d2e47632213ec13251e925.tar.xz
Merge to XFA: Rename CPDF_PageObjects to CPDF_PageObjectList
Orignal Review URL: https://codereview.chromium.org/1612113003 . (cherry picked from commit 9ebc84109d7d2f7b81f06f19e5db20888e026c3b) R=ochang@chromium.org TBR=ochang@chromium.org Review URL: https://codereview.chromium.org/1612243002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page')
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page.cpp20
-rw-r--r--core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp2
-rw-r--r--core/src/fpdfapi/fpdf_page/pageint.h8
3 files changed, 15 insertions, 15 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
index 1d18b5343d..b1bd277bb5 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp
@@ -666,7 +666,7 @@ void CPDF_FormObject::CalcBoundingBox() {
m_Right = form_rect.right;
m_Top = form_rect.top;
}
-CPDF_PageObjects::CPDF_PageObjects()
+CPDF_PageObjectList::CPDF_PageObjectList()
: m_pFormDict(nullptr),
m_pFormStream(nullptr),
m_pDocument(nullptr),
@@ -677,13 +677,13 @@ CPDF_PageObjects::CPDF_PageObjects()
m_bHasImageMask(FALSE),
m_ParseState(CONTENT_NOT_PARSED),
m_ObjectList(128) {}
-CPDF_PageObjects::~CPDF_PageObjects() {
+CPDF_PageObjectList::~CPDF_PageObjectList() {
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
delete (CPDF_PageObject*)m_ObjectList.GetNext(pos);
}
}
-void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
+void CPDF_PageObjectList::ContinueParse(IFX_Pause* pPause) {
if (!m_pParser) {
return;
}
@@ -693,14 +693,14 @@ void CPDF_PageObjects::ContinueParse(IFX_Pause* pPause) {
m_pParser.reset();
}
}
-FX_POSITION CPDF_PageObjects::InsertObject(FX_POSITION posInsertAfter,
- CPDF_PageObject* pNewObject) {
+FX_POSITION CPDF_PageObjectList::InsertObject(FX_POSITION posInsertAfter,
+ CPDF_PageObject* pNewObject) {
if (!posInsertAfter) {
return m_ObjectList.AddHead(pNewObject);
}
return m_ObjectList.InsertAfter(posInsertAfter, pNewObject);
}
-int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
+int CPDF_PageObjectList::GetObjectIndex(CPDF_PageObject* pObj) const {
int index = 0;
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
@@ -712,18 +712,18 @@ int CPDF_PageObjects::GetObjectIndex(CPDF_PageObject* pObj) const {
}
return -1;
}
-CPDF_PageObject* CPDF_PageObjects::GetObjectByIndex(int index) const {
+CPDF_PageObject* CPDF_PageObjectList::GetObjectByIndex(int index) const {
FX_POSITION pos = m_ObjectList.FindIndex(index);
return pos ? static_cast<CPDF_PageObject*>(m_ObjectList.GetAt(pos)) : nullptr;
}
-void CPDF_PageObjects::Transform(const CFX_Matrix& matrix) {
+void CPDF_PageObjectList::Transform(const CFX_Matrix& matrix) {
FX_POSITION pos = m_ObjectList.GetHeadPosition();
while (pos) {
CPDF_PageObject* pObj = (CPDF_PageObject*)m_ObjectList.GetNext(pos);
pObj->Transform(matrix);
}
}
-CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
+CFX_FloatRect CPDF_PageObjectList::CalcBoundingBox() const {
if (m_ObjectList.GetCount() == 0) {
return CFX_FloatRect(0, 0, 0, 0);
}
@@ -748,7 +748,7 @@ CFX_FloatRect CPDF_PageObjects::CalcBoundingBox() const {
}
return CFX_FloatRect(left, bottom, right, top);
}
-void CPDF_PageObjects::LoadTransInfo() {
+void CPDF_PageObjectList::LoadTransInfo() {
if (!m_pFormDict) {
return;
}
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
index 08b10e5500..c5e407d4ea 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp
@@ -114,7 +114,7 @@ CPDF_StreamContentParser::CPDF_StreamContentParser(
CPDF_Dictionary* pPageResources,
CPDF_Dictionary* pParentResources,
CFX_Matrix* pmtContentToUser,
- CPDF_PageObjects* pObjList,
+ CPDF_PageObjectList* pObjList,
CPDF_Dictionary* pResources,
CPDF_Rect* pBBox,
CPDF_ParseOptions* pOptions,
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h
index 49f7a0e42c..3d33387e2d 100644
--- a/core/src/fpdfapi/fpdf_page/pageint.h
+++ b/core/src/fpdfapi/fpdf_page/pageint.h
@@ -93,7 +93,7 @@ class CPDF_StreamContentParser {
CPDF_Dictionary* pPageResources,
CPDF_Dictionary* pParentResources,
CFX_Matrix* pmtContentToUser,
- CPDF_PageObjects* pObjList,
+ CPDF_PageObjectList* pObjList,
CPDF_Dictionary* pResources,
CFX_FloatRect* pBBox,
CPDF_ParseOptions* pOptions,
@@ -101,7 +101,7 @@ class CPDF_StreamContentParser {
int level);
~CPDF_StreamContentParser();
- CPDF_PageObjects* GetObjectList() const { return m_pObjectList; }
+ CPDF_PageObjectList* GetObjectList() const { return m_pObjectList; }
CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
FX_BOOL IsColored() const { return m_bColored; }
const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
@@ -235,7 +235,7 @@ class CPDF_StreamContentParser {
CPDF_Dictionary* m_pPageResources;
CPDF_Dictionary* m_pParentResources;
CPDF_Dictionary* m_pResources;
- CPDF_PageObjects* m_pObjectList;
+ CPDF_PageObjectList* m_pObjectList;
int m_Level;
CFX_Matrix m_mtContentToUser;
CFX_FloatRect m_BBox;
@@ -297,7 +297,7 @@ class CPDF_ContentParser {
ParseStatus m_Status;
InternalStage m_InternalStage;
- CPDF_PageObjects* m_pObjects;
+ CPDF_PageObjectList* m_pObjects;
FX_BOOL m_bForm;
CPDF_ParseOptions m_Options;
CPDF_Type3Char* m_pType3Char;