From bc75f62774a31ca94188e1910624bac246d550f7 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Mon, 15 Oct 2018 18:12:40 +0000
Subject: 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              | 6 ++++++
 fxjs/cjs_color.cpp         | 1 +
 fxjs/cjs_color.h           | 1 -
 fxjs/cjs_field.cpp         | 1 +
 fxjs/cjs_publicmethods.cpp | 2 ++
 fxjs/cjs_runtime.cpp       | 1 -
 fxjs/ijs_runtime.cpp       | 1 -
 7 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'fxjs')

diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index a197d78f13..673386becb 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -104,6 +104,12 @@ jumbo_source_set("fxjs") {
       "jse_define.h",
     ]
     deps += [
+      "../core/fdrm",
+      "../core/fpdfapi/font",
+      "../core/fpdfapi/page",
+      "../core/fpdfapi/parser",
+      "../core/fpdfdoc",
+      "../core/fxge",
       "//v8",
       "//v8:v8_libplatform",
     ]
diff --git a/fxjs/cjs_color.cpp b/fxjs/cjs_color.cpp
index 06c61f87d4..7ce5c2937c 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"
diff --git a/fxjs/cjs_color.h b/fxjs/cjs_color.h
index b1bd211395..4e28166cd2 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 {
diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp
index 35e2bb51b0..a7366264a5 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"
diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp
index 2e0603c982..fb65cc4098 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"
diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index 539594cd90..3bc8448435 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
diff --git a/fxjs/ijs_runtime.cpp b/fxjs/ijs_runtime.cpp
index 50abd39c8b..34a846e9e3 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"
 
-- 
cgit v1.2.3