Inflict PPDF_ENABLE_XFA ifdefs on XFA core/

core/include/fpdfdoc/fpdf_doc.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 #define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
 
 #include <map>
@@ skipping 807 matching lines @@
   int GetSelectedOptionIndex(int index);
 
   FX_BOOL IsOptionSelected(int iOptIndex);
 
   FX_BOOL SelectOption(int iOptIndex,
                        FX_BOOL bSelected,
                        FX_BOOL bNotify = FALSE);
 
   FX_BOOL ClearSelectedOptions(FX_BOOL bNotify = FALSE);
 
+#ifdef PDF_ENABLE_XFA
   FX_BOOL ClearOptions(FX_BOOL bNotify = FALSE);
 
   int InsertOption(CFX_WideString csOptLabel,
                    int index = -1,
                    FX_BOOL bNotify = FALSE);
 
+#endif

[Lei Zhang, 2015/11/24 23:36:04]

Blank line below rather than above? Ditto in other files.

[Tom Sepez, 2015/11/25 18:51:45]

Yep, that's just a result of the way automated diff works. Will fix manually in
next CL.

   FX_FLOAT GetFontSize() { return m_FontSize; }
 
   CPDF_Font* GetFont() { return m_pFont; }
 
  protected:
   CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict);
 
   ~CPDF_FormField();
 
   CPDF_FormField::Type m_Type;
@@ skipping 319 matching lines @@
   CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
 
   CPDF_Dictionary* const m_pDict;
 };
 
 CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
 
 #endif  // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_