Small tidy of fxjs
Use correct include style for v8 headers.
Use incomplete type to avoid including header.
Change-Id: Ibd58aa25b2a17fbd1cf6a20643b6f25ca008974f
Reviewed-on: https://pdfium-review.googlesource.com/25230
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/cjs_v8.h b/fxjs/cjs_v8.h
index 1dd4953..1a8d15b 100644
--- a/fxjs/cjs_v8.h
+++ b/fxjs/cjs_v8.h
@@ -7,15 +7,14 @@
#ifndef FXJS_CJS_V8_H_
#define FXJS_CJS_V8_H_
-#include <v8-util.h>
-#include <v8.h>
-
#include <map>
#include <vector>
#include "core/fxcrt/bytestring.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/widestring.h"
+#include "v8/include/v8-util.h"
+#include "v8/include/v8.h"
#ifdef PDF_ENABLE_XFA
class CXFA_Object;
diff --git a/fxjs/fxjs_v8.cpp b/fxjs/fxjs_v8.cpp
index 4c9c560..c9d227c 100644
--- a/fxjs/fxjs_v8.cpp
+++ b/fxjs/fxjs_v8.cpp
@@ -8,6 +8,7 @@
#include <vector>
+#include "fxjs/cfxjse_runtimedata.h"
#include "third_party/base/allocator/partition_allocator/partition_alloc.h"
// Keep this consistent with the values defined in gin/public/context_holder.h
diff --git a/fxjs/fxjs_v8.h b/fxjs/fxjs_v8.h
index 851bdd5..6878bcd 100644
--- a/fxjs/fxjs_v8.h
+++ b/fxjs/fxjs_v8.h
@@ -14,23 +14,20 @@
#ifndef FXJS_FXJS_V8_H_
#define FXJS_FXJS_V8_H_
-#include <v8-util.h>
-#include <v8.h>
-
#include <map>
#include <memory>
#include <vector>
#include "core/fxcrt/fx_string.h"
#include "fxjs/cjs_v8.h"
+#include "v8/include/v8-util.h"
+#include "v8/include/v8.h"
#ifdef PDF_ENABLE_XFA
-// Header for CFXJSE_RuntimeData. FXJS_V8 doesn't interpret this class,
-// it is just passed along to XFA.
-#include "fxjs/cfxjse_runtimedata.h"
+// FXJS_V8 doesn't interpret this class, it is just passed along to XFA.
+class CFXJSE_RuntimeData;
#endif // PDF_ENABLE_XFA
-class CFXJS_Engine;
class CFXJS_ObjDefinition;
// FXJS_V8 places no restrictions on this class; it merely passes it
