commit d7ac26c410073359ef83c84bba21df7956b024fb
author dan sinclair <dsinclair@chromium.org> Wed Oct 25 20:30:02 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Thu Oct 26 17:00:07 2017 +0000
tree 1cf55a36c09165334a3003272883eb96f01c99ce
parent 95460d82634a7464670d697b8c9f0d58a298f3a4

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>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 8d3148d..7cdd7e2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1219,6 +1219,8 @@
       "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 @@
       "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",

fpdfsdk/javascript/cjs_global.cpp

diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/cjs_global.cpp
similarity index 99%
rename from fpdfsdk/javascript/global.cpp
rename to fpdfsdk/javascript/cjs_global.cpp
index df7927b..f282a26 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>

fpdfsdk/javascript/cjs_global.h

diff --git a/fpdfsdk/javascript/global.h b/fpdfsdk/javascript/cjs_global.h
similarity index 91%
rename from fpdfsdk/javascript/global.h
rename to fpdfsdk/javascript/cjs_global.h
index 77794a2..a98bf97 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 @@
       const v8::FunctionCallbackInfo<v8::Value>& info);
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_GLOBAL_H_
+#endif  // FPDFSDK_JAVASCRIPT_CJS_GLOBAL_H_

fpdfsdk/javascript/cjs_runtime.cpp

diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 05bdb7c..e48d696 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"