Merge to XFA: Fix IWYU in formfiller/ directory.
authorTom Sepez <tsepez@chromium.org>
Wed, 8 Apr 2015 23:19:33 +0000 (16:19 -0700)
committerTom Sepez <tsepez@chromium.org>
Wed, 8 Apr 2015 23:19:33 +0000 (16:19 -0700)
Original Review URL: https://codereview.chromium.org/1066253002
TBR=thestig@chromium.org

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

14 files changed:
fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h
fpdfsdk/include/formfiller/FFL_CheckBox.h
fpdfsdk/include/formfiller/FFL_ComboBox.h
fpdfsdk/include/formfiller/FFL_ListBox.h
fpdfsdk/include/formfiller/FFL_Notify.h
fpdfsdk/include/formfiller/FFL_PushButton.h
fpdfsdk/include/formfiller/FFL_RadioButton.h
fpdfsdk/include/formfiller/FFL_TextField.h
fpdfsdk/include/formfiller/FFL_Utils.h
fpdfsdk/include/fpdf_dataavail.h
fpdfsdk/include/fsdk_actionhandler.h
fpdfsdk/include/fsdk_annothandler.h
fpdfsdk/include/fsdk_baseannot.h
fpdfsdk/include/fsdk_baseform.h

index 50f5160..8601b98 100644 (file)
@@ -7,10 +7,9 @@
 #ifndef _RAO_FONTMAP_H_
 #define _RAO_FONTMAP_H_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
+#include "../pdfwindow/PWL_FontMap.h"
 
+class CPDF_Dictionary;
 class CPDFSDK_Annot;
 
 class CBA_FontMap : public CPWL_FontMap
index 9aaf7fe..240e748 100644 (file)
@@ -7,6 +7,8 @@
 #ifndef _FFL_CHECKBOX_H_
 #define _FFL_CHECKBOX_H_
 
+#include "FFL_FormFiller.h"
+
 class CFFL_CheckBox : public CFFL_Button
 {
 public:
index e3ad8b1..df7ca55 100644 (file)
@@ -5,7 +5,13 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FFL_COMBOBOX_H_
- #define _FFL_COMBOBOX_H_
+#define _FFL_COMBOBOX_H_
+
+#include "../../../core/include/fxcrt/fx_string.h"
+#include "FFL_FormFiller.h"
+
+class CBA_FontMap;
+class CPDFSDK_Document;
 
 struct FFL_ComboBoxState
 {
@@ -14,7 +20,6 @@ struct FFL_ComboBoxState
        int nEnd;
        CFX_WideString sValue;
 };
-class CBA_FontMap;
 
 class CFFL_ComboBox : public CFFL_FormFiller, public IPWL_FocusHandler, public IPWL_Edit_Notify
 {
index 43f5fce..03f71df 100644 (file)
@@ -7,7 +7,10 @@
 #ifndef _FFL_LISTBOX_H_
 #define _FFL_LISTBOX_H_
 
+#include "FFL_FormFiller.h"
+
 class  CBA_FontMap;
+
 class CFFL_ListBox : public CFFL_FormFiller
 {
 public:
index c729b74..bd21ffc 100644 (file)
@@ -4,10 +4,14 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#if !defined(_FFL_NOTIFY_H_)
+#ifndef _FFL_NOTIFY_H_
 #define _FFL_NOTIFY_H_
 
+#include "../../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../../core/include/fxcrt/fx_string.h"
+
 class CFFL_FormFiller;
+class CPDF_FormField;
 
 class CFFL_Notify
 {
@@ -38,7 +42,6 @@ public:
        FX_BOOL                                                                 IsNotifying() const {return m_nNotifyFlag > 0;}
 
 private:
-//     CReader_InterForm *                                             GetReaderInterForm();
        FX_BOOL                                                                 DoAAction(CPDF_AAction::AActionType eAAT, FX_BOOL & bExit);
        FX_BOOL                                                                 FindAAction(CPDF_AAction::AActionType eAAT,CPDF_Action & action);
        FX_BOOL                                                                 FindAAction(CPDF_AAction aaction,CPDF_AAction::AActionType eAAT,CPDF_Action & action);
index be5e735..5d115c0 100644 (file)
@@ -7,6 +7,8 @@
 #ifndef _FFL_PUSHBUTTON_H_
 #define _FFL_PUSHBUTTON_H_
 
+#include "FFL_FormFiller.h"
+
 class CFFL_PushButton : public CFFL_Button
 {
 public:
index 037e563..2049a45 100644 (file)
@@ -7,6 +7,8 @@
 #ifndef _FFL_RADIOBUTTON_H_
 #define _FFL_RADIOBUTTON_H_
 
+#include "FFL_FormFiller.h"
+
 class CFFL_RadioButton : public CFFL_Button
 {
 public:
index 53ddfb7..b987a9c 100644 (file)
@@ -15,7 +15,8 @@
 
 class CBA_FontMap;
 
-class CFFL_EditUndoItem //: public IUndoItem
+
+class CFFL_EditUndoItem
 {
 public:
        CFFL_EditUndoItem(CPWL_Edit* pEdit);
index c5ac2a2..e64cce9 100644 (file)
@@ -7,7 +7,10 @@
 #ifndef _FFL_UTILS_H_
 #define _FFL_UTILS_H_
 
-#define FFL_BASE_USERUNIT                      1.0f / 72.0f
+#include "../../../core/include/fpdfapi/fpdf_parser.h"
+#include "../../../core/include/fxcrt/fx_memory.h"
+
+#define FFL_BASE_USERUNIT                      (1.0f / 72.0f)
 
 class CFFL_Utils
 {
index 04f632a..de6cb23 100644 (file)
@@ -7,10 +7,9 @@
 #ifndef _FPDF_DATAAVAIL_H_
 #define _FPDF_DATAAVAIL_H_
 
-#ifndef _FPDFVIEW_H_
-#include "fpdfview.h"
-#endif
+#include <stddef.h>  // For size_t.
 
+#include "fpdfview.h"
 
 /** The result of the process which check linearized PDF. */
 #define FSDK_IS_LINEARIZED                     1
index 65d38d7..1ec7c09 100644 (file)
@@ -7,8 +7,16 @@
 #ifndef _FSDK_ACTIONHANDLER_H_
 #define _FSDK_ACTIONHANDLER_H_
 
+#include "../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../core/include/fxcrt/fx_string.h"
+#include "fsdk_baseform.h"
 
+class CFX_PtrList;
 class CPDFDoc_Environment;
+class CPDFSDK_Annot;
+class CPDFSDK_Document;
+class CPDF_Bookmark;
+class CPDF_Dictionary;
 class IFXJS_Runtime;
 
 class CPDFSDK_FormActionHandler
index 6f2b71b..f4b88f2 100644 (file)
@@ -7,11 +7,20 @@
 #ifndef _FSDK_ANNOTHANDLER_H_
 #define _FSDK_ANNOTHANDLER_H_
 
+#include "../../core/include/fxcrt/fx_basic.h"
+
 #define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
 
-class CPDFDoc_Environment;
 class CFFL_IFormFiller;
+class CFX_RenderDevice;
+class CPDFDoc_Environment;
+class CPDFSDK_Annot;
 class CPDFSDK_PageView;
+class CPDF_Annot;
+class CPDF_Matrix;
+class CPDF_Point;
+class CPDF_Rect;
+
 class IPDFSDK_AnnotHandler
 {
 
index 5f56fc7..0655e9c 100644 (file)
 #include <ctime>
 #endif
 
+#include "../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../core/include/fxcrt/fx_basic.h"
+#include "fx_systemhandler.h"
+
 class CPDFSDK_PageView;
+class CPDF_Annot;
+class CPDF_Page;
+class CPDF_Rect;
+class CPDF_Matrix;
+class CPDF_RenderOptions;
+class CFX_RenderDevice;
+
 #define CFX_IntArray                           CFX_ArrayTemplate<int>
 
 class  CPDFSDK_DateTime : public CFX_Object
index 42de101..ff9dfa1 100644 (file)
 #include <ctime>
 #endif
 
-class CPDFSDK_Document;
-class  CPDFSDK_DateTime;
-struct CPWL_Color;
+#include "../../core/include/fpdfapi/fpdf_parser.h"
+#include "../../core/include/fpdfdoc/fpdf_doc.h"
+#include "../../core/include/fxcrt/fx_basic.h"
+#include "../../core/include/fxge/fx_dib.h"
+#include "fsdk_baseannot.h"
+
 class CFFL_FormFiller;
-class CPDFSDK_PageView;
+class CPDFSDK_Annot;
+class CPDFSDK_DateTime;
+class CPDFSDK_Document;
 class CPDFSDK_InterForm;
+class CPDFSDK_PageView;
+class CPDF_Action;
+class CPDF_FormField;
+struct CPWL_Color;
 
 typedef enum _PDFSDK_XFAAActionType
 {