commit bc75f62774a31ca94188e1910624bac246d550f7
author Lei Zhang <thestig@chromium.org> Mon Oct 15 18:12:40 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Oct 15 18:12:40 2018 +0000
tree c9826fe551d97a076d092a38109810e97fc80e44
parent d7f51c715146be53186b25ca677e49e164b51527

Make fxjs/ pass gn check.

Use allow_circular_includes_from as a crutch for now.

Change-Id: I8c53bafd864048506a77354f57e27cac50369005
Reviewed-on: https://pdfium-review.googlesource.com/c/43989
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fxjs/BUILD.gn

diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index a197d78..673386b 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -104,6 +104,12 @@
       "jse_define.h",
     ]
     deps += [
+      "../core/fdrm",
+      "../core/fpdfapi/font",
+      "../core/fpdfapi/page",
+      "../core/fpdfapi/parser",
+      "../core/fpdfdoc",
+      "../core/fxge",
       "//v8",
       "//v8:v8_libplatform",
     ]

fxjs/cjs_color.cpp

diff --git a/fxjs/cjs_color.cpp b/fxjs/cjs_color.cpp
index 06c61f8..7ce5c29 100644
--- a/fxjs/cjs_color.cpp
+++ b/fxjs/cjs_color.cpp
@@ -8,6 +8,7 @@
 
 #include <vector>
 
+#include "core/fxge/cfx_color.h"
 #include "fxjs/cjs_event_context.h"
 #include "fxjs/cjs_eventhandler.h"
 #include "fxjs/cjs_object.h"

fxjs/cjs_color.h

diff --git a/fxjs/cjs_color.h b/fxjs/cjs_color.h
index b1bd211..4e28166 100644
--- a/fxjs/cjs_color.h
+++ b/fxjs/cjs_color.h
@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "fpdfsdk/pwl/cpwl_wnd.h"
 #include "fxjs/js_define.h"
 
 class CJS_Color final : public CJS_Object {

fxjs/cjs_field.cpp

diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 35e2bb5..a736626 100644
--- a/fxjs/cjs_field.cpp
+++ b/fxjs/cjs_field.cpp
@@ -11,6 +11,7 @@
 #include <utility>
 
 #include "core/fpdfapi/font/cpdf_font.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fpdfdoc/cpdf_interactiveform.h"
 #include "fpdfsdk/cpdfsdk_interactiveform.h"

fxjs/cjs_publicmethods.cpp

diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index 2e0603c..fb65cc4 100644
--- a/fxjs/cjs_publicmethods.cpp
+++ b/fxjs/cjs_publicmethods.cpp
@@ -17,8 +17,10 @@
 #include <utility>
 #include <vector>
 
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fpdfdoc/cpdf_interactiveform.h"
 #include "core/fxcrt/fx_extension.h"
+#include "core/fxge/cfx_color.h"
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/cpdfsdk_interactiveform.h"
 #include "fxjs/cjs_color.h"

fxjs/cjs_runtime.cpp

diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index 539594c..3bc8448 100644
--- a/fxjs/cjs_runtime.cpp
+++ b/fxjs/cjs_runtime.cpp
@@ -39,7 +39,6 @@
 #include "fxjs/cjs_util.h"
 #include "fxjs/cjs_zoomtype.h"
 #include "fxjs/js_define.h"
-#include "public/fpdf_formfill.h"
 #include "third_party/base/ptr_util.h"
 
 #ifdef PDF_ENABLE_XFA

fxjs/ijs_runtime.cpp

diff --git a/fxjs/ijs_runtime.cpp b/fxjs/ijs_runtime.cpp
index 50abd39..34a846e 100644
--- a/fxjs/ijs_runtime.cpp
+++ b/fxjs/ijs_runtime.cpp
@@ -4,7 +4,6 @@
 
 #include "fxjs/ijs_runtime.h"
 
-#include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fxjs/cjs_runtimestub.h"
 #include "third_party/base/ptr_util.h"