From 3745841a4c4ab915c98865c1dd71f9debc3e2f99 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 6 Oct 2015 11:33:46 -0700
Subject: Merge to XFA: Make the vast majority of JS headers private to
 src/javascript.

(cherry picked from commit 5b3d0208723f21c50b9922bdc500c9d78c359a25)
Original Review URL: https://codereview.chromium.org/1389783002 .

New changes to fix IWYU in:
  fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
  xfa/include/fxfa/fxfa.h
  xfa/include/fxfa/fxfa_objectacc.h

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1388023003 .
---
 xfa/include/fxfa/fxfa.h           | 19 ++++++++++---------
 xfa/include/fxfa/fxfa_objectacc.h | 10 +++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'xfa/include')

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 5ccd1f206f..503909a1c4 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -7,26 +7,27 @@
 #ifndef FXFA_H_
 #define FXFA_H_
 
-class IFDE_XMLElement;
+class CFX_Graphics;
+class CPDF_Document;
 class CXFA_Node;
 class CXFA_NodeList;
 class CXFA_WidgetAcc;
+class IFDE_XMLElement;
 class IFWL_AdapterTimerMgr;
 class IFX_Font;
-class CFX_Graphics;
-class IXFA_AppProvider;
 class IXFA_App;
-class IXFA_FontMgr;
-class IXFA_DocProvider;
+class IXFA_AppProvider;
+class IXFA_ChecksumContext;
 class IXFA_DocHandler;
+class IXFA_DocProvider;
 class IXFA_DocView;
-class IXFA_PageViewRender;
+class IXFA_FontMgr;
+class IXFA_MenuHandler;
 class IXFA_PageView;
+class IXFA_PageViewRender;
+class IXFA_WidgetAccIterator;
 class IXFA_WidgetHandler;
 class IXFA_WidgetIterator;
-class IXFA_MenuHandler;
-class IXFA_ChecksumContext;
-class IXFA_WidgetAccIterator;
 
 class IXFA_Doc {
  public:
diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index f90fca35fa..3cef82b363 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -4,8 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FXFA_NODEACC_H
-#define _FXFA_NODEACC_H
+#ifndef FXFA_OBJECTACC_H_
+#define FXFA_OBJECTACC_H_
+
+#include "../../../core/include/fxge/fx_dib.h"  // For FX_ARGB.
+
 class CXFA_Node;
 class IFX_Locale;
 class CXFA_Data;
@@ -841,4 +844,5 @@ class CXFA_Manifest : public CXFA_Data {
   int32_t CountReives();
   CFX_WideString GetRefContent(int32_t nIndex);
 };
-#endif
+
+#endif  // FXFA_OBJECTACC_H_
-- 
cgit v1.2.3