diff options
author | Tom Sepez <tsepez@chromium.org> | 2016-01-21 16:09:36 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2016-01-21 16:09:36 -0800 |
commit | 8139bc147f6936d490d2e47632213ec13251e925 (patch) | |
tree | 881be2d42955320a6f296c9558c11804f1edb71a /core/include | |
parent | b5b2a9162e3e5d17b233d912399daca9be5ed51b (diff) | |
download | pdfium-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/include')
-rw-r--r-- | core/include/fpdfapi/fpdf_module.h | 2 | ||||
-rw-r--r-- | core/include/fpdfapi/fpdf_page.h | 10 | ||||
-rw-r--r-- | core/include/fpdfapi/fpdf_render.h | 4 | ||||
-rw-r--r-- | core/include/fpdftext/fpdf_text.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h index e22b63e544..f68511cc77 100644 --- a/core/include/fpdfapi/fpdf_module.h +++ b/core/include/fpdfapi/fpdf_module.h @@ -24,7 +24,7 @@ class CPDF_Document; class CPDF_FontGlobals; class CPDF_Image; class CPDF_Page; -class CPDF_PageObjects; +class CPDF_PageObjectList; class CPDF_PageRenderCache; class CPDF_RenderConfig; class CPDF_RenderOptions; diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h index 2ff8a0596b..20030e7dea 100644 --- a/core/include/fpdfapi/fpdf_page.h +++ b/core/include/fpdfapi/fpdf_page.h @@ -26,10 +26,10 @@ class CPDF_StreamContentParser; #define PDFTRANS_ISOLATED 0x0200 #define PDFTRANS_KNOCKOUT 0x0400 -class CPDF_PageObjects { +class CPDF_PageObjectList { public: - CPDF_PageObjects(); - ~CPDF_PageObjects(); + CPDF_PageObjectList(); + ~CPDF_PageObjectList(); void ContinueParse(IFX_Pause* pPause); @@ -96,7 +96,7 @@ class CPDF_PageObjects { CFX_PtrList m_ObjectList; }; -class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData { +class CPDF_Page : public CPDF_PageObjectList, public CFX_PrivateData { public: CPDF_Page(); ~CPDF_Page(); @@ -142,7 +142,7 @@ class CPDF_ParseOptions { FX_BOOL m_bDecodeInlineImage; }; -class CPDF_Form : public CPDF_PageObjects { +class CPDF_Form : public CPDF_PageObjectList { public: CPDF_Form(CPDF_Document* pDocument, CPDF_Dictionary* pPageResources, diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 1c8a99ac7d..b4178a7f86 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -85,7 +85,7 @@ class CPDF_RenderContext { CPDF_RenderContext(CPDF_Document* pDoc, CPDF_PageRenderCache* pPageCache); ~CPDF_RenderContext(); - void AppendObjectList(CPDF_PageObjects* pObjs, + void AppendObjectList(CPDF_PageObjectList* pObjs, const CFX_Matrix* pObject2Device); void Render(CFX_RenderDevice* pDevice, @@ -93,7 +93,7 @@ class CPDF_RenderContext { const CFX_Matrix* pFinalMatrix = NULL); void DrawObjectList(CFX_RenderDevice* pDevice, - CPDF_PageObjects* pObjs, + CPDF_PageObjectList* pObjs, const CFX_Matrix* pObject2Device, const CPDF_RenderOptions* pOptions); diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index a7fc6bdfbb..77b0c29a6b 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -10,7 +10,7 @@ #include "core/include/fpdfapi/fpdf_parser.h" class CPDF_Page; -class CPDF_PageObjects; +class CPDF_PageObjectList; class CPDF_TextObject; class IPDF_LinkExtract; class IPDF_ReflowedPage; |