diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-05 11:14:12 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-05 17:22:58 +0000 |
| commit | 921fe6bfde3b4cf3da4b55fab77103af3a65cab4 (patch) | |
| tree | 2587bf5ab7c8d72a085137c9986235c0c1514b2c /core/fpdfdoc | |
| parent | 023d645733cddcf026897c51f3d4c34090eb4b2d (diff) | |
| download | pdfium-921fe6bfde3b4cf3da4b55fab77103af3a65cab4.tar.xz | |
Move CPDF_RenderOptions members to private
This CL moves the members of CPDF_RenderOptions to be private members
and adds accessor methods as needed.
Change-Id: Ie91665ff53ae00cc4c53741d089d375503fabe11
Reviewed-on: https://pdfium-review.googlesource.com/15531
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_annot.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_annotlist.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 1a8538057c..1ccb890c04 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -418,7 +418,7 @@ void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, return; } bool bPrinting = pDevice->GetDeviceClass() == FXDC_PRINTER || - (pOptions && (pOptions->m_Flags & RENDER_PRINTPREVIEW)); + (pOptions && (pOptions->HasFlag(RENDER_PRINTPREVIEW))); if (bPrinting && (annot_flags & ANNOTFLAG_PRINT) == 0) { return; } @@ -501,7 +501,7 @@ void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice, path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width, rect.top - width); int fill_type = 0; - if (pOptions && (pOptions->m_Flags & RENDER_NOPATHSMOOTH)) + if (pOptions && (pOptions->HasFlag(RENDER_NOPATHSMOOTH))) fill_type |= FXFILL_NOPATHSMOOTH; pDevice->DrawPath(&path, pUser2Device, &graph_state, argb, argb, fill_type); diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index 503c533b84..9224943d1e 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -141,10 +141,10 @@ void CPDF_AnnotList::DisplayPass(CPDF_Page* pPage, continue; if (pOptions) { - RetainPtr<CPDF_OCContext> pOCContext = pOptions->m_pOCContext; CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict(); - if (pOCContext && pAnnotDict && - !pOCContext->CheckOCGVisible(pAnnotDict->GetDictFor("OC"))) { + if (pOptions->GetOCContext() && pAnnotDict && + !pOptions->GetOCContext()->CheckOCGVisible( + pAnnotDict->GetDictFor("OC"))) { continue; } } |