commit 95460d82634a7464670d697b8c9f0d58a298f3a4
author dan sinclair <dsinclair@chromium.org> Wed Oct 25 20:25:04 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Thu Oct 26 16:59:37 2017 +0000
tree 8e75bed8fed3087bddeb80f60ecf2baee7c46ead
parent 993a19931a6ad343310b7d5d076d9e45af0ed528

Rename Annot to cjs_annot

Thist CL renames Annot.{h|cpp} to cjs_annot.{h|cpp} to better match the primary
class.

Change-Id: I9c3e2fcbb149d97e90098018f42205568ef179b1
Reviewed-on: https://pdfium-review.googlesource.com/16851
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index eb9ed75..8d3148d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1188,8 +1188,6 @@
 
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/javascript/Annot.cpp",
-      "fpdfsdk/javascript/Annot.h",
       "fpdfsdk/javascript/Document.cpp",
       "fpdfsdk/javascript/Document.h",
       "fpdfsdk/javascript/Field.cpp",
@@ -1211,6 +1209,8 @@
       "fpdfsdk/javascript/PublicMethods.h",
       "fpdfsdk/javascript/app.cpp",
       "fpdfsdk/javascript/app.h",
+      "fpdfsdk/javascript/cjs_annot.cpp",
+      "fpdfsdk/javascript/cjs_annot.h",
       "fpdfsdk/javascript/cjs_border.cpp",
       "fpdfsdk/javascript/cjs_border.h",
       "fpdfsdk/javascript/cjs_display.cpp",

fpdfsdk/javascript/Document.cpp

diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index fbd7763..d72f838 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -24,7 +24,6 @@
 #include "fpdfsdk/cpdfsdk_interform.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/javascript/Annot.h"
 #include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/Icon.h"
 #include "fpdfsdk/javascript/JS_Define.h"
@@ -32,6 +31,7 @@
 #include "fpdfsdk/javascript/JS_Object.h"
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"
 #include "fpdfsdk/javascript/cjs_runtime.h"
 #include "fpdfsdk/javascript/resource.h"

fpdfsdk/javascript/cjs_annot.cpp

diff --git a/fpdfsdk/javascript/Annot.cpp b/fpdfsdk/javascript/cjs_annot.cpp
similarity index 98%
rename from fpdfsdk/javascript/Annot.cpp
rename to fpdfsdk/javascript/cjs_annot.cpp
index 4240bbc..e69f7ce 100644
--- a/fpdfsdk/javascript/Annot.cpp
+++ b/fpdfsdk/javascript/cjs_annot.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/javascript/Annot.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
 
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_Object.h"

fpdfsdk/javascript/cjs_annot.h

diff --git a/fpdfsdk/javascript/Annot.h b/fpdfsdk/javascript/cjs_annot.h
similarity index 90%
rename from fpdfsdk/javascript/Annot.h
rename to fpdfsdk/javascript/cjs_annot.h
index b7c951b..d630431 100644
--- a/fpdfsdk/javascript/Annot.h
+++ b/fpdfsdk/javascript/cjs_annot.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_JAVASCRIPT_ANNOT_H_
-#define FPDFSDK_JAVASCRIPT_ANNOT_H_
+#ifndef FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
+#define FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_
 
 #include "fpdfsdk/cpdfsdk_baannot.h"
 #include "fpdfsdk/javascript/JS_Define.h"
@@ -41,4 +41,4 @@
   JS_STATIC_PROP(type, type, Annot);
 };
 
-#endif  // FPDFSDK_JAVASCRIPT_ANNOT_H_
+#endif  // FPDFSDK_JAVASCRIPT_CJS_ANNOT_H_

fpdfsdk/javascript/cjs_runtime.cpp

diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 0209933..05bdb7c 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -9,7 +9,6 @@
 #include <algorithm>
 
 #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
-#include "fpdfsdk/javascript/Annot.h"
 #include "fpdfsdk/javascript/Document.h"
 #include "fpdfsdk/javascript/Field.h"
 #include "fpdfsdk/javascript/Icon.h"
@@ -20,6 +19,7 @@
 #include "fpdfsdk/javascript/JS_Value.h"
 #include "fpdfsdk/javascript/PublicMethods.h"
 #include "fpdfsdk/javascript/app.h"
+#include "fpdfsdk/javascript/cjs_annot.h"
 #include "fpdfsdk/javascript/cjs_border.h"
 #include "fpdfsdk/javascript/cjs_display.h"
 #include "fpdfsdk/javascript/cjs_event_context.h"