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/src/fpdfapi/fpdf_render | |
| 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/src/fpdfapi/fpdf_render')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render.cpp | 6 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index 6a821ec069..5222d69fde 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -240,7 +240,7 @@ FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, m_Transparency = transparency; return TRUE; } -void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs, +void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjectList* pObjs, const CFX_Matrix* pObj2Device) { CFX_FloatRect clip_rect = m_pDevice->GetClipBox(); CFX_Matrix device2object; @@ -968,7 +968,7 @@ CPDF_RenderContext::CPDF_RenderContext(CPDF_Document* pDoc, m_pPageCache(pPageCache), m_bFirstLayer(TRUE) {} CPDF_RenderContext::~CPDF_RenderContext() {} -void CPDF_RenderContext::AppendObjectList(CPDF_PageObjects* pObjs, +void CPDF_RenderContext::AppendObjectList(CPDF_PageObjectList* pObjs, const CFX_Matrix* pObject2Device) { _PDF_RenderItem* pItem = m_ContentList.AddSpace(); pItem->m_pObjectList = pObjs; @@ -1023,7 +1023,7 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice, } } void CPDF_RenderContext::DrawObjectList(CFX_RenderDevice* pDevice, - CPDF_PageObjects* pObjs, + CPDF_PageObjectList* pObjs, const CFX_Matrix* pObject2Device, const CPDF_RenderOptions* pOptions) { AppendObjectList(pObjs, pObject2Device); diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index 5530754ab0..3a81ba5587 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -93,7 +93,7 @@ class CPDF_DocRenderData { }; struct _PDF_RenderItem { public: - CPDF_PageObjects* m_pObjectList; + CPDF_PageObjectList* m_pObjectList; CFX_Matrix m_Matrix; }; @@ -131,7 +131,7 @@ class CPDF_RenderStatus { FX_ARGB fill_color = 0, FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE); - void RenderObjectList(const CPDF_PageObjects* pObjs, + void RenderObjectList(const CPDF_PageObjectList* pObjs, const CFX_Matrix* pObj2Device); void RenderSingleObject(const CPDF_PageObject* pObj, const CFX_Matrix* pObj2Device); |