diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-25 23:37:50 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-25 23:37:50 +0000 |
| commit | ca02733961f84abd562d59e4b6a83018ef41b143 (patch) | |
| tree | a5f2cb28353fc82aab57f99d6605f5b817a04cce /fpdfsdk/fpdf_formfill.cpp | |
| parent | df93cd35530e7b8dd67abde8d199c36c3fae76be (diff) | |
| download | pdfium-ca02733961f84abd562d59e4b6a83018ef41b143.tar.xz | |
Replace some #ifdefs PDF_ENABLE_XFA, part 2.
Tidy some code encountered along the way in cpdfsdk_helpers.cpp
Remove one ifdef from xfa-only file.
Restore some option flag processing (probably wrong to remove).
Flip some #ifndef to #ifdef (#ifndef PDF_ENABLE_XFA is an
anti-pattern and should be treated with suspicion since XFA should
always be "additive").
Change-Id: I564a28401e20e6269c85ea610da8c96f8c8dd737
Reviewed-on: https://pdfium-review.googlesource.com/32834
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/fpdf_formfill.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_formfill.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index 8a43fa6e77..0124124ff6 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp @@ -148,6 +148,8 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, HandleToCPDFSDKEnvironment(hHandle); if (!pFormFillEnv) return; +#else // PDF_ENABLE_XFA + CPDF_Document* pPDFDoc = pPage->GetDocument(); #endif // PDF_ENABLE_XFA const FX_RECT rect(start_x, start_y, start_x + size_x, start_y + size_y); @@ -176,15 +178,13 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, options.SetColorMode(CPDF_RenderOptions::kGray); options.SetDrawAnnots(flags & FPDF_ANNOT); - -#ifdef PDF_ENABLE_XFA options.SetOCContext( pdfium::MakeRetain<CPDF_OCContext>(pPDFDoc, CPDF_OCContext::View)); + +#ifdef PDF_ENABLE_XFA if (CPDFSDK_PageView* pPageView = pFormFillEnv->GetPageView(pPage, true)) pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options, rect); #else // PDF_ENABLE_XFA - options.SetOCContext(pdfium::MakeRetain<CPDF_OCContext>( - pPage->GetDocument(), CPDF_OCContext::View)); if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, FPDFPageFromUnderlying(pPage))) pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options); |