commit a8a39e25af3c19bb91434fdf367cffa0e1536934
author Tom Sepez <tsepez@chromium.org> Mon Oct 12 15:47:07 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Mon Oct 12 15:47:07 2015 -0700
tree d6bfa30a756014ec79dfce75d6658ecf3778594a
parent 5ef9faa8e8f5593556d78f775d86f1e52e4c341a

Allow building of XFA branch without XFA

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1399833002 .

fpdfsdk/src/fsdk_annothandler.cpp

diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index 287a26b..11d2aef 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -765,6 +765,8 @@
                                      CFX_RenderDevice* pDevice,
                                      CPDF_Matrix* pUser2Device,
                                      FX_DWORD dwFlags) {
+#ifdef PDF_ENABLE_XFA
+
   ASSERT(pPageView != NULL);
   ASSERT(pAnnot != NULL);
 
@@ -790,6 +792,7 @@
   pWidgetHandler->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt, bIsHighlight);
 
   // to do highlight and shadow
+#endif  // PDF_ENABLE_XFA
 }
 
 void CPDFSDK_XFAAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot) {
@@ -811,13 +814,15 @@
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   ASSERT(pWidgetHandler != NULL);
 
+  CFX_RectF rcBBox;
+#ifdef PDF_ENABLE_XFA
   XFA_ELEMENT eType =
       pWidgetHandler->GetDataAcc(pAnnot->GetXFAWidget())->GetUIType();
-  CFX_RectF rcBBox;
   if (eType == XFA_ELEMENT_Signature)
     pWidgetHandler->GetBBox(pAnnot->GetXFAWidget(), rcBBox,
                             XFA_WIDGETSTATUS_Visible, TRUE);
   else
+#endif
     pWidgetHandler->GetBBox(pAnnot->GetXFAWidget(), rcBBox, 0);
 
   CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.left + rcBBox.width,