summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn6
-rw-r--r--fpdfsdk/javascript/cjs_publicmethods.cpp2
-rw-r--r--fpdfsdk/javascript/cjs_runtime.cpp2
-rw-r--r--fpdfsdk/javascript/cjs_util.cpp (renamed from fpdfsdk/javascript/util.cpp)2
-rw-r--r--fpdfsdk/javascript/cjs_util.h (renamed from fpdfsdk/javascript/util.h)6
-rw-r--r--fpdfsdk/javascript/cjs_util_unittest.cpp (renamed from fpdfsdk/javascript/util_unittest.cpp)2
6 files changed, 10 insertions, 10 deletions
diff --git a/BUILD.gn b/BUILD.gn
index cedfbca4fe..5550790462 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1254,14 +1254,14 @@ static_library("javascript") {
"fpdfsdk/javascript/cjs_style.h",
"fpdfsdk/javascript/cjs_timerobj.cpp",
"fpdfsdk/javascript/cjs_timerobj.h",
+ "fpdfsdk/javascript/cjs_util.cpp",
+ "fpdfsdk/javascript/cjs_util.h",
"fpdfsdk/javascript/cjs_zoomtype.cpp",
"fpdfsdk/javascript/cjs_zoomtype.h",
"fpdfsdk/javascript/global_timer.cpp",
"fpdfsdk/javascript/global_timer.h",
"fpdfsdk/javascript/js_resources.cpp",
"fpdfsdk/javascript/js_resources.h",
- "fpdfsdk/javascript/util.cpp",
- "fpdfsdk/javascript/util.h",
]
deps += [ ":fxjs" ]
configs += [ "//v8:external_startup_data" ]
@@ -2015,7 +2015,7 @@ test("pdfium_unittests") {
if (pdf_enable_v8) {
sources += [
"fpdfsdk/javascript/cjs_publicmethods_unittest.cpp",
- "fpdfsdk/javascript/util_unittest.cpp",
+ "fpdfsdk/javascript/cjs_util_unittest.cpp",
]
include_dirs += [
"//v8",
diff --git a/fpdfsdk/javascript/cjs_publicmethods.cpp b/fpdfsdk/javascript/cjs_publicmethods.cpp
index fb4cc2c3ee..3a309d4225 100644
--- a/fpdfsdk/javascript/cjs_publicmethods.cpp
+++ b/fpdfsdk/javascript/cjs_publicmethods.cpp
@@ -26,8 +26,8 @@
#include "fpdfsdk/javascript/cjs_field.h"
#include "fpdfsdk/javascript/cjs_object.h"
#include "fpdfsdk/javascript/cjs_runtime.h"
+#include "fpdfsdk/javascript/cjs_util.h"
#include "fpdfsdk/javascript/js_resources.h"
-#include "fpdfsdk/javascript/util.h"
#define DOUBLE_CORRECT 0.000000000000001
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index ae66e99ca4..9e09ad2996 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -37,8 +37,8 @@
#include "fpdfsdk/javascript/cjs_scalewhen.h"
#include "fpdfsdk/javascript/cjs_style.h"
#include "fpdfsdk/javascript/cjs_timerobj.h"
+#include "fpdfsdk/javascript/cjs_util.h"
#include "fpdfsdk/javascript/cjs_zoomtype.h"
-#include "fpdfsdk/javascript/util.h"
#include "public/fpdf_formfill.h"
#include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/cjs_util.cpp
index 3dd5eb6d91..6eb52f13fe 100644
--- a/fpdfsdk/javascript/util.cpp
+++ b/fpdfsdk/javascript/cjs_util.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/javascript/util.h"
+#include "fpdfsdk/javascript/cjs_util.h"
#include <time.h>
diff --git a/fpdfsdk/javascript/util.h b/fpdfsdk/javascript/cjs_util.h
index 269b89efa3..f3d808bcb6 100644
--- a/fpdfsdk/javascript/util.h
+++ b/fpdfsdk/javascript/cjs_util.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_JAVASCRIPT_UTIL_H_
-#define FPDFSDK_JAVASCRIPT_UTIL_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
+#define FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
#include <string>
#include <vector>
@@ -60,4 +60,4 @@ class CJS_Util : public CJS_Object {
static const JSMethodSpec MethodSpecs[];
};
-#endif // FPDFSDK_JAVASCRIPT_UTIL_H_
+#endif // FPDFSDK_JAVASCRIPT_CJS_UTIL_H_
diff --git a/fpdfsdk/javascript/util_unittest.cpp b/fpdfsdk/javascript/cjs_util_unittest.cpp
index 8e28dc1bdc..bfd5b58abd 100644
--- a/fpdfsdk/javascript/util_unittest.cpp
+++ b/fpdfsdk/javascript/cjs_util_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "fpdfsdk/javascript/util.h"
+#include "fpdfsdk/javascript/cjs_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"