Allow building non-XFA (master) on the XFA branch.

fpdfsdk/src/fsdk_mgr.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 <algorithm>
 
 #include "fpdfsdk/include/fsdk_mgr.h"
 
@@ skipping 599 matching lines @@
 CFX_WideString CPDFSDK_Document::GetPath() {
   ASSERT(m_pEnv != NULL);
   return m_pEnv->JS_docGetFilePath();
 }
 
 CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,
                                    UnderlyingPageType* page)
     : m_page(page),
       m_pSDKDoc(pSDKDoc),
       m_CaptureWidget(nullptr),
+#ifndef PDF_ENABLE_XFA
+      m_bTakeOverPage(FALSE),
+#endif  // PDF_ENABLE_XFA
       m_bEnterWidget(FALSE),
       m_bExitWidget(FALSE),
       m_bOnWidget(FALSE),
       m_bValid(FALSE),
-#ifdef PDF_ENABLE_XFA
       m_bLocked(FALSE) {
-#else   // PDF_ENABLE_XFA
-      m_bLocked(FALSE),
-      m_bTakeOverPage(FALSE) {
-#endif  // PDF_ENABLE_XFA
   CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm();
   if (pInterForm) {
     CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
 #ifdef PDF_ENABLE_XFA
     if (page->GetPDFPage())
       pPDFInterForm->FixPageFields(page->GetPDFPage());
 #else   // PDF_ENABLE_XFA
     pPDFInterForm->FixPageFields(page);
 #endif  // PDF_ENABLE_XFA
   }
@@ skipping 516 matching lines @@
   CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot();
   if (!pFocusAnnot)
     return nullptr;
 
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
     if (pAnnot == pFocusAnnot)
       return pAnnot;
   }
   return nullptr;
 }