Clean up redundant code in PDF_ENABLE_XFA guards in FFLCommon.

fpdfsdk/fpdfformfill.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "public/fpdf_formfill.h"
 
 #include <memory>
 #include <vector>
@@ skipping 57 matching lines @@
                int size_y,
                int rotate,
                int flags) {
   if (!hHandle)
     return;
 
   UnderlyingPageType* pPage = UnderlyingFromFPDFPage(page);
   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;
   CPDF_Document* pPDFDoc = pDocument->GetPDFDoc();
   if (!pPDFDoc)
     return;
   CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle;
   CPDFSDK_Document* pFXDoc = pEnv->GetSDKDocument();
   if (!pFXDoc)
     return;
 #endif  // PDF_ENABLE_XFA
 
   CFX_Matrix matrix;
   pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate);
 
   FX_RECT clip(start_x, start_y, start_x + size_x, start_y + size_y);
 
   std::unique_ptr<CFX_FxgeDevice> pDevice(new CFX_FxgeDevice);
 #ifdef _SKIA_SUPPORT_
   pDevice->AttachRecorder(static_cast<SkPictureRecorder*>(recorder));
 #endif
   pDevice->Attach(CFXBitmapFromFPDFBitmap(bitmap), false, nullptr, false);
   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;
   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;
+
+#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
 
 DLLEXPORT int STDCALL FPDFPage_HasFormFieldAtPoint(FPDF_FORMHANDLE hHandle,
                                                    FPDF_PAGE page,
                                                    double page_x,
                                                    double page_y) {
   if (!hHandle)
     return -1;
@@ skipping 570 matching lines @@
       CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
       pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
     }
   } else {
     if (aa.ActionExist(CPDF_AAction::ClosePage)) {
       CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
       pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
     }
   }
 }