summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordan sinclair <dsinclair@chromium.org>2017-10-25 20:30:02 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-10-26 17:00:07 +0000
commitd7ac26c410073359ef83c84bba21df7956b024fb (patch)
tree1cf55a36c09165334a3003272883eb96f01c99ce
parent95460d82634a7464670d697b8c9f0d58a298f3a4 (diff)
downloadpdfium-d7ac26c410073359ef83c84bba21df7956b024fb.tar.xz
Move global.{h|cpp} to match class
This CL moves global.{h|cpp} to cjs_global.{h|cpp} to match the internal class name. Change-Id: I58a0dfcb36ee35320a0ad0d134a544e615dc93bf Reviewed-on: https://pdfium-review.googlesource.com/16870 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
-rw-r--r--BUILD.gn4
-rw-r--r--fpdfsdk/javascript/cjs_global.cpp (renamed from fpdfsdk/javascript/global.cpp)2
-rw-r--r--fpdfsdk/javascript/cjs_global.h (renamed from fpdfsdk/javascript/global.h)6
-rw-r--r--fpdfsdk/javascript/cjs_runtime.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 8d3148dd01..7cdd7e210e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1219,6 +1219,8 @@ static_library("javascript") {
"fpdfsdk/javascript/cjs_event_context.h",
"fpdfsdk/javascript/cjs_font.cpp",
"fpdfsdk/javascript/cjs_font.h",
+ "fpdfsdk/javascript/cjs_global.cpp",
+ "fpdfsdk/javascript/cjs_global.h",
"fpdfsdk/javascript/cjs_globalarrays.cpp",
"fpdfsdk/javascript/cjs_globalarrays.h",
"fpdfsdk/javascript/cjs_globalconsts.cpp",
@@ -1243,8 +1245,6 @@ static_library("javascript") {
"fpdfsdk/javascript/console.h",
"fpdfsdk/javascript/event.cpp",
"fpdfsdk/javascript/event.h",
- "fpdfsdk/javascript/global.cpp",
- "fpdfsdk/javascript/global.h",
"fpdfsdk/javascript/report.cpp",
"fpdfsdk/javascript/report.h",
"fpdfsdk/javascript/resource.cpp",
diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/cjs_global.cpp
index df7927b116..f282a2694e 100644
--- a/fpdfsdk/javascript/global.cpp
+++ b/fpdfsdk/javascript/cjs_global.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/javascript/global.h"
+#include "fpdfsdk/javascript/cjs_global.h"
#include <map>
#include <memory>
diff --git a/fpdfsdk/javascript/global.h b/fpdfsdk/javascript/cjs_global.h
index 77794a2e34..a98bf97f78 100644
--- a/fpdfsdk/javascript/global.h
+++ b/fpdfsdk/javascript/cjs_global.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_JAVASCRIPT_GLOBAL_H_
-#define FPDFSDK_JAVASCRIPT_GLOBAL_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
+#define FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
#include "fpdfsdk/javascript/JS_Define.h"
@@ -36,4 +36,4 @@ class CJS_Global : public CJS_Object {
const v8::FunctionCallbackInfo<v8::Value>& info);
};
-#endif // FPDFSDK_JAVASCRIPT_GLOBAL_H_
+#endif // FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 05bdb7c235..e48d696866 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -24,6 +24,7 @@
#include "fpdfsdk/javascript/cjs_display.h"
#include "fpdfsdk/javascript/cjs_event_context.h"
#include "fpdfsdk/javascript/cjs_font.h"
+#include "fpdfsdk/javascript/cjs_global.h"
#include "fpdfsdk/javascript/cjs_globalarrays.h"
#include "fpdfsdk/javascript/cjs_globalconsts.h"
#include "fpdfsdk/javascript/cjs_highlight.h"
@@ -35,7 +36,6 @@
#include "fpdfsdk/javascript/color.h"
#include "fpdfsdk/javascript/console.h"
#include "fpdfsdk/javascript/event.h"
-#include "fpdfsdk/javascript/global.h"
#include "fpdfsdk/javascript/report.h"
#include "fpdfsdk/javascript/util.h"
#include "public/fpdf_formfill.h"