commit 99b9ffb79d92a8719e006b096c3802da8cb6ae7e
author Tom Sepez <tsepez@chromium.org> Mon Dec 10 19:03:30 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Dec 10 19:03:30 2018 +0000
tree 2d3b2e68879aef358e3b42439e4626ccf09fb841
parent 32660f54f79530f36cfd78ca88dae996d4fa9c88

Rename xfa_basic_data_{enum,element_script}.cpp to match header file name

Combine and rename to xfa_basic_data.cpp to match xfa_basic_data.h.

Change-Id: I96d1c84d8ccff1c077e1b95b0651df389b5e4aab
Reviewed-on: https://pdfium-review.googlesource.com/c/46930
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fxfa/parser/BUILD.gn

diff --git a/xfa/fxfa/parser/BUILD.gn b/xfa/fxfa/parser/BUILD.gn
index 8d9dc06..3b23f30 100644
--- a/xfa/fxfa/parser/BUILD.gn
+++ b/xfa/fxfa/parser/BUILD.gn
@@ -690,9 +690,8 @@
     "cxfa_xsl.h",
     "cxfa_zpl.cpp",
     "cxfa_zpl.h",
+    "xfa_basic_data.cpp",
     "xfa_basic_data.h",
-    "xfa_basic_data_element_script.cpp",
-    "xfa_basic_data_enum.cpp",
     "xfa_document_datamerger_imp.cpp",
     "xfa_document_datamerger_imp.h",
     "xfa_resolvenode_rs.h",

xfa/fxfa/parser/xfa_basic_data.cpp

diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
similarity index 99%
rename from xfa/fxfa/parser/xfa_basic_data_element_script.cpp
rename to xfa/fxfa/parser/xfa_basic_data.cpp
index 639fc53..c98c6c1 100644
--- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -149,6 +149,15 @@
 #include "fxjs/xfa/cjx_xsdconnection.h"
 #include "xfa/fxfa/fxfa_basic.h"
 
+const XFA_AttributeValueInfo g_XFAEnumData[] = {
+#undef VALUE____
+#define VALUE____(a, b, c) {a, XFA_AttributeValue::c, b},
+#include "xfa/fxfa/parser/attribute_values.inc"
+#undef VALUE____
+};
+
+const size_t g_szXFAEnumCount = FX_ArraySize(g_XFAEnumData);
+
 const XFA_Element g_XFAScriptParents[] = {
 #undef ELEM____
 #undef ELEM_HIDDEN____

xfa/fxfa/parser/xfa_basic_data_enum.cpp

diff --git a/xfa/fxfa/parser/xfa_basic_data_enum.cpp b/xfa/fxfa/parser/xfa_basic_data_enum.cpp
deleted file mode 100644
index 7f93192..0000000
--- a/xfa/fxfa/parser/xfa_basic_data_enum.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "xfa/fxfa/parser/xfa_basic_data.h"
-
-#include "core/fxcrt/fx_memory.h"
-#include "xfa/fxfa/fxfa_basic.h"
-
-const XFA_AttributeValueInfo g_XFAEnumData[] = {
-#undef VALUE____
-#define VALUE____(a, b, c) {a, XFA_AttributeValue::c, b},
-#include "xfa/fxfa/parser/attribute_values.inc"
-#undef VALUE____
-};
-
-const size_t g_szXFAEnumCount = FX_ArraySize(g_XFAEnumData);