diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-06-07 19:43:42 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-07 19:43:42 +0000 |
| commit | 888af47eec5784c1919200087769b7e58e5efd02 (patch) | |
| tree | 5e9916c5f3b83ff4f33674a945a987c38ad68d05 /core/fpdfapi/page/cpdf_contentparser.cpp | |
| parent | 4cc32e30aaacc2e527acd052fa038158f4294636 (diff) | |
| download | pdfium-888af47eec5784c1919200087769b7e58e5efd02.tar.xz | |
Rename CPDF_PageObjectHolder::GetFormDict() to GetDict().
Renamed the underlying member m_pFormDict as well.
These names are misleading, as a page also uses the same field as
the page dict.
Change-Id: I52e0f1864a917a1e1b863725cb0d4f22faecacb3
Reviewed-on: https://pdfium-review.googlesource.com/34450
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_contentparser.cpp')
| -rw-r--r-- | core/fpdfapi/page/cpdf_contentparser.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp index 29b5f122bd..77cfade1da 100644 --- a/core/fpdfapi/page/cpdf_contentparser.cpp +++ b/core/fpdfapi/page/cpdf_contentparser.cpp @@ -25,12 +25,12 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Page* pPage) : m_CurrentStage(Stage::kGetContent), m_pObjectHolder(pPage) { ASSERT(pPage); - if (!pPage->GetDocument() || !pPage->GetFormDict()) { + if (!pPage->GetDocument() || !pPage->GetDict()) { m_CurrentStage = Stage::kComplete; return; } - CPDF_Object* pContent = pPage->GetFormDict()->GetDirectObjectFor("Contents"); + CPDF_Object* pContent = pPage->GetDict()->GetDirectObjectFor("Contents"); if (!pContent) { m_CurrentStage = Stage::kComplete; return; @@ -67,11 +67,11 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm, m_pObjectHolder(pForm), m_pType3Char(pType3Char) { ASSERT(pForm); - CFX_Matrix form_matrix = pForm->GetFormDict()->GetMatrixFor("Matrix"); + CFX_Matrix form_matrix = pForm->GetDict()->GetMatrixFor("Matrix"); if (pGraphicStates) form_matrix.Concat(pGraphicStates->m_CTM); - CPDF_Array* pBBox = pForm->GetFormDict()->GetArrayFor("BBox"); + CPDF_Array* pBBox = pForm->GetDict()->GetArrayFor("BBox"); CFX_FloatRect form_bbox; CPDF_Path ClipPath; if (pBBox) { @@ -88,7 +88,7 @@ CPDF_ContentParser::CPDF_ContentParser(CPDF_Form* pForm, form_bbox = pParentMatrix->TransformRect(form_bbox); } - CPDF_Dictionary* pResources = pForm->GetFormDict()->GetDictFor("Resources"); + CPDF_Dictionary* pResources = pForm->GetDict()->GetDictFor("Resources"); m_pParser = pdfium::MakeUnique<CPDF_StreamContentParser>( pForm->GetDocument(), pForm->m_pPageResources.Get(), pForm->m_pResources.Get(), pParentMatrix, pForm, pResources, form_bbox, @@ -141,8 +141,7 @@ bool CPDF_ContentParser::Continue(PauseIndicatorIface* pPause) { } CPDF_ContentParser::Stage CPDF_ContentParser::GetContent() { - CPDF_Array* pContent = - m_pObjectHolder->GetFormDict()->GetArrayFor("Contents"); + CPDF_Array* pContent = m_pObjectHolder->GetDict()->GetArrayFor("Contents"); CPDF_Stream* pStreamObj = ToStream( pContent ? pContent->GetDirectObjectAt(m_CurrentOffset) : nullptr); m_StreamArray[m_CurrentOffset] = |