summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-10-30 17:29:24 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-10-30 17:29:24 +0000
commita5c874c1240a0be86d6db0536940c1d0942b4c6d (patch)
tree811058a078d42fc395462379b13ef62002dca3d6
parenta146507fdbe8a8d13fe590b5fa883efc7bffe90a (diff)
downloadpdfium-a5c874c1240a0be86d6db0536940c1d0942b4c6d.tar.xz
Rename PublicMethods to cjs_publicmethods
This CL renames the PublicMethods.{cpp|h} files to match the internal class name. Change-Id: I530f4ce5b53dd74cbef447faf0875782bfe27b70 Reviewed-on: https://pdfium-review.googlesource.com/17039 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
-rw-r--r--BUILD.gn8
-rw-r--r--fpdfsdk/javascript/cjs_publicmethods.cpp (renamed from fpdfsdk/javascript/PublicMethods.cpp)2
-rw-r--r--fpdfsdk/javascript/cjs_publicmethods.h (renamed from fpdfsdk/javascript/PublicMethods.h)6
-rw-r--r--fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp (renamed from fpdfsdk/javascript/public_methods_embeddertest.cpp)8
-rw-r--r--fpdfsdk/javascript/cjs_publicmethods_unittest.cpp (renamed from fpdfsdk/javascript/public_methods_unittest.cpp)2
-rw-r--r--fpdfsdk/javascript/cjs_runtime.cpp2
-rw-r--r--fpdfsdk/javascript/util.cpp2
7 files changed, 15 insertions, 15 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 612ea18cdc..5d86038d14 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1194,8 +1194,6 @@ static_library("javascript") {
"fpdfsdk/javascript/JS_GlobalData.h",
"fpdfsdk/javascript/JS_KeyValue.cpp",
"fpdfsdk/javascript/JS_KeyValue.h",
- "fpdfsdk/javascript/PublicMethods.cpp",
- "fpdfsdk/javascript/PublicMethods.h",
"fpdfsdk/javascript/app.cpp",
"fpdfsdk/javascript/app.h",
"fpdfsdk/javascript/cjs_annot.cpp",
@@ -1234,6 +1232,8 @@ static_library("javascript") {
"fpdfsdk/javascript/cjs_position.h",
"fpdfsdk/javascript/cjs_printparamsobj.cpp",
"fpdfsdk/javascript/cjs_printparamsobj.h",
+ "fpdfsdk/javascript/cjs_publicmethods.cpp",
+ "fpdfsdk/javascript/cjs_publicmethods.h",
"fpdfsdk/javascript/cjs_return.cpp",
"fpdfsdk/javascript/cjs_return.h",
"fpdfsdk/javascript/cjs_runtime.cpp",
@@ -2010,7 +2010,7 @@ test("pdfium_unittests") {
}
if (pdf_enable_v8) {
sources += [
- "fpdfsdk/javascript/public_methods_unittest.cpp",
+ "fpdfsdk/javascript/cjs_publicmethods_unittest.cpp",
"fpdfsdk/javascript/util_unittest.cpp",
]
include_dirs += [
@@ -2074,7 +2074,7 @@ test("pdfium_embeddertests") {
if (pdf_enable_v8) {
sources += [
- "fpdfsdk/javascript/public_methods_embeddertest.cpp",
+ "fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp",
"fxjs/fxjs_v8_embeddertest.cpp",
"testing/js_embedder_test.cpp",
"testing/js_embedder_test.h",
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/cjs_publicmethods.cpp
index 7969b62d9a..c62bf7be67 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/cjs_publicmethods.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/cjs_publicmethods.h"
#include <algorithm>
#include <cmath>
diff --git a/fpdfsdk/javascript/PublicMethods.h b/fpdfsdk/javascript/cjs_publicmethods.h
index 9e9d56aabd..9943654dab 100644
--- a/fpdfsdk/javascript/PublicMethods.h
+++ b/fpdfsdk/javascript/cjs_publicmethods.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
-#define FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
+#define FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
#include <string>
#include <vector>
@@ -156,4 +156,4 @@ class CJS_PublicMethods : public CJS_Object {
v8::Local<v8::Value> val);
};
-#endif // FPDFSDK_JAVASCRIPT_PUBLICMETHODS_H_
+#endif // FPDFSDK_JAVASCRIPT_CJS_PUBLICMETHODS_H_
diff --git a/fpdfsdk/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp
index f6af01f4c1..b5a48d2064 100644
--- a/fpdfsdk/javascript/public_methods_embeddertest.cpp
+++ b/fpdfsdk/javascript/cjs_publicmethods_embeddertest.cpp
@@ -5,7 +5,7 @@
#include <cmath>
#include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/javascript/PublicMethods.h"
+#include "fpdfsdk/javascript/cjs_publicmethods.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/js_embedder_test.h"
@@ -17,9 +17,9 @@ double RoundDownDate(double date) {
} // namespace
-class PublicMethodsEmbedderTest : public JSEmbedderTest {};
+class CJS_PublicMethodsEmbedderTest : public JSEmbedderTest {};
-TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) {
+TEST_F(CJS_PublicMethodsEmbedderTest, MakeRegularDate) {
v8::Isolate::Scope isolate_scope(isolate());
v8::HandleScope handle_scope(isolate());
v8::Context::Scope context_scope(GetV8Context());
@@ -99,7 +99,7 @@ TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) {
EXPECT_FALSE(bWrongFormat);
}
-TEST_F(PublicMethodsEmbedderTest, MakeFormatDate) {
+TEST_F(CJS_PublicMethodsEmbedderTest, MakeFormatDate) {
v8::Isolate::Scope isolate_scope(isolate());
v8::HandleScope handle_scope(isolate());
v8::Context::Scope context_scope(GetV8Context());
diff --git a/fpdfsdk/javascript/public_methods_unittest.cpp b/fpdfsdk/javascript/cjs_publicmethods_unittest.cpp
index ace0920e8f..82f2139576 100644
--- a/fpdfsdk/javascript/public_methods_unittest.cpp
+++ b/fpdfsdk/javascript/cjs_publicmethods_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/PublicMethods.h"
+#include "fpdfsdk/javascript/cjs_publicmethods.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 139dacf6da..b6b99ca839 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -11,7 +11,6 @@
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/javascript/JS_Define.h"
#include "fpdfsdk/javascript/JS_GlobalData.h"
-#include "fpdfsdk/javascript/PublicMethods.h"
#include "fpdfsdk/javascript/app.h"
#include "fpdfsdk/javascript/cjs_annot.h"
#include "fpdfsdk/javascript/cjs_border.h"
@@ -29,6 +28,7 @@
#include "fpdfsdk/javascript/cjs_object.h"
#include "fpdfsdk/javascript/cjs_position.h"
#include "fpdfsdk/javascript/cjs_printparamsobj.h"
+#include "fpdfsdk/javascript/cjs_publicmethods.h"
#include "fpdfsdk/javascript/cjs_scalehow.h"
#include "fpdfsdk/javascript/cjs_scalewhen.h"
#include "fpdfsdk/javascript/cjs_style.h"
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp
index 99934726ff..29e3fd5fbc 100644
--- a/fpdfsdk/javascript/util.cpp
+++ b/fpdfsdk/javascript/util.cpp
@@ -16,10 +16,10 @@
#include "core/fxcrt/fx_extension.h"
#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/javascript/PublicMethods.h"
#include "fpdfsdk/javascript/cjs_event_context.h"
#include "fpdfsdk/javascript/cjs_eventhandler.h"
#include "fpdfsdk/javascript/cjs_object.h"
+#include "fpdfsdk/javascript/cjs_publicmethods.h"
#include "fpdfsdk/javascript/cjs_runtime.h"
#include "fpdfsdk/javascript/resource.h"