summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authorjaepark <jaepark@google.com>2016-09-02 18:51:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-02 18:51:44 -0700
commit738766eefaf14fabb168f1f5a5c987f8e7049cab (patch)
tree29b7422e043f06bf09eec2c2ec4f15a830a752cd /fpdfsdk
parentd21f22e2c07d61bf15ee3af91869901adb6f0cde (diff)
downloadpdfium-738766eefaf14fabb168f1f5a5c987f8e7049cab.tar.xz
Clean up redundant code in PDF_ENABLE_XFA guard in FFLCommon.chromium/2849
Review-Url: https://codereview.chromium.org/2307243002
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdfformfill.cpp31
1 files changed, 8 insertions, 23 deletions
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index 263f5bbc59..449eac0870 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
@@ -75,22 +75,7 @@ void FFLCommon(FPDF_FORMHANDLE hHandle,
if (!pPage)
return;
-#ifndef PDF_ENABLE_XFA
- CPDF_RenderOptions options;
- if (flags & FPDF_LCD_TEXT)
- options.m_Flags |= RENDER_CLEARTYPE;
- else
- options.m_Flags &= ~RENDER_CLEARTYPE;
- // Grayscale output
- if (flags & FPDF_GRAYSCALE) {
- options.m_ColorMode = RENDER_COLOR_GRAY;
- options.m_ForeColor = 0;
- options.m_BackColor = 0xffffff;
- }
- options.m_AddFlags = flags >> 8;
- options.m_pOCContext =
- new CPDF_OCContext(pPage->m_pDocument, CPDF_OCContext::View);
-#else // PDF_ENABLE_XFA
+#ifdef PDF_ENABLE_XFA
CPDFXFA_Document* pDocument = pPage->GetDocument();
if (!pDocument)
return;
@@ -116,10 +101,6 @@ void FFLCommon(FPDF_FORMHANDLE hHandle,
pDevice->SaveState();
pDevice->SetClip_Rect(clip);
-#ifndef PDF_ENABLE_XFA
- if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, pPage))
- pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options);
-#else // PDF_ENABLE_XFA
CPDF_RenderOptions options;
if (flags & FPDF_LCD_TEXT)
options.m_Flags |= RENDER_CLEARTYPE;
@@ -133,17 +114,21 @@ void FFLCommon(FPDF_FORMHANDLE hHandle,
options.m_BackColor = 0xffffff;
}
options.m_AddFlags = flags >> 8;
- options.m_pOCContext = new CPDF_OCContext(pPDFDoc, CPDF_OCContext::View);
+#ifdef PDF_ENABLE_XFA
+ options.m_pOCContext = new CPDF_OCContext(pPDFDoc, CPDF_OCContext::View);
if (CPDFSDK_PageView* pPageView = pFXDoc->GetPageView(pPage, true))
pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options, clip);
+#else // PDF_ENABLE_XFA
+ options.m_pOCContext =
+ new CPDF_OCContext(pPage->m_pDocument, CPDF_OCContext::View);
+ if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, pPage))
+ pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options);
#endif // PDF_ENABLE_XFA
pDevice->RestoreState(false);
delete options.m_pOCContext;
-#ifdef PDF_ENABLE_XFA
options.m_pOCContext = nullptr;
-#endif // PDF_ENABLE_XFA
}
} // namespace