From 19ae9bf554fc1c01e352a846646c8005a4fe6b2b Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 16 Apr 2018 16:54:27 +0000 Subject: Use CFX_XML instead of CXML in CPDF_Metadata This CL converts CPDF_Metadata to use the CFX_XML classes instead of CXML classes. This also moves the CFX_XML classes from being XFA only to being used everywhere. Change-Id: Idb784f8aaa0bc843d8a3415ba5262ccf4949308a Reviewed-on: https://pdfium-review.googlesource.com/30650 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- BUILD.gn | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index 45857e552d..f28a879643 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -821,6 +821,8 @@ jumbo_static_library("fxcrt") { "core/fxcrt/cfx_binarybuf.h", "core/fxcrt/cfx_bitstream.cpp", "core/fxcrt/cfx_bitstream.h", + "core/fxcrt/cfx_blockbuffer.cpp", + "core/fxcrt/cfx_blockbuffer.h", "core/fxcrt/cfx_datetime.cpp", "core/fxcrt/cfx_datetime.h", "core/fxcrt/cfx_fileaccess_posix.cpp", @@ -832,6 +834,8 @@ jumbo_static_library("fxcrt") { "core/fxcrt/cfx_memorystream.h", "core/fxcrt/cfx_seekablemultistream.cpp", "core/fxcrt/cfx_seekablemultistream.h", + "core/fxcrt/cfx_seekablestreamproxy.cpp", + "core/fxcrt/cfx_seekablestreamproxy.h", "core/fxcrt/cfx_utf8decoder.cpp", "core/fxcrt/cfx_utf8decoder.h", "core/fxcrt/cfx_widetextbuf.cpp", @@ -871,6 +875,20 @@ jumbo_static_library("fxcrt") { "core/fxcrt/weak_ptr.h", "core/fxcrt/widestring.cpp", "core/fxcrt/widestring.h", + "core/fxcrt/xml/cfx_xmlattributenode.cpp", + "core/fxcrt/xml/cfx_xmlattributenode.h", + "core/fxcrt/xml/cfx_xmlchardata.cpp", + "core/fxcrt/xml/cfx_xmlchardata.h", + "core/fxcrt/xml/cfx_xmlelement.cpp", + "core/fxcrt/xml/cfx_xmlelement.h", + "core/fxcrt/xml/cfx_xmlinstruction.cpp", + "core/fxcrt/xml/cfx_xmlinstruction.h", + "core/fxcrt/xml/cfx_xmlnode.cpp", + "core/fxcrt/xml/cfx_xmlnode.h", + "core/fxcrt/xml/cfx_xmlparser.cpp", + "core/fxcrt/xml/cfx_xmlparser.h", + "core/fxcrt/xml/cfx_xmltext.cpp", + "core/fxcrt/xml/cfx_xmltext.h", "core/fxcrt/xml/cxml_attritem.cpp", "core/fxcrt/xml/cxml_attritem.h", "core/fxcrt/xml/cxml_content.cpp", @@ -897,14 +915,10 @@ jumbo_static_library("fxcrt") { if (pdf_enable_xfa) { sources += [ - "core/fxcrt/cfx_blockbuffer.cpp", - "core/fxcrt/cfx_blockbuffer.h", "core/fxcrt/cfx_char.cpp", "core/fxcrt/cfx_char.h", "core/fxcrt/cfx_decimal.cpp", "core/fxcrt/cfx_decimal.h", - "core/fxcrt/cfx_seekablestreamproxy.cpp", - "core/fxcrt/cfx_seekablestreamproxy.h", "core/fxcrt/css/cfx_css.h", "core/fxcrt/css/cfx_csscolorvalue.cpp", "core/fxcrt/css/cfx_csscolorvalue.h", @@ -949,20 +963,6 @@ jumbo_static_library("fxcrt") { "core/fxcrt/fx_arabic.cpp", "core/fxcrt/fx_arabic.h", "core/fxcrt/locale_iface.h", - "core/fxcrt/xml/cfx_xmlattributenode.cpp", - "core/fxcrt/xml/cfx_xmlattributenode.h", - "core/fxcrt/xml/cfx_xmlchardata.cpp", - "core/fxcrt/xml/cfx_xmlchardata.h", - "core/fxcrt/xml/cfx_xmlelement.cpp", - "core/fxcrt/xml/cfx_xmlelement.h", - "core/fxcrt/xml/cfx_xmlinstruction.cpp", - "core/fxcrt/xml/cfx_xmlinstruction.h", - "core/fxcrt/xml/cfx_xmlnode.cpp", - "core/fxcrt/xml/cfx_xmlnode.h", - "core/fxcrt/xml/cfx_xmlparser.cpp", - "core/fxcrt/xml/cfx_xmlparser.h", - "core/fxcrt/xml/cfx_xmltext.cpp", - "core/fxcrt/xml/cfx_xmltext.h", ] } } @@ -2897,6 +2897,7 @@ test("pdfium_unittests") { "core/fxcrt/unowned_ptr_unittest.cpp", "core/fxcrt/weak_ptr_unittest.cpp", "core/fxcrt/widestring_unittest.cpp", + "core/fxcrt/xml/cfx_xmlparser_unittest.cpp", "core/fxge/dib/cfx_dibitmap_unittest.cpp", "core/fxge/dib/cstretchengine_unittest.cpp", "fpdfsdk/fpdf_catalog_unittest.cpp", @@ -2918,7 +2919,6 @@ test("pdfium_unittests") { "core/fxcrt/css/cfx_cssdeclaration_unittest.cpp", "core/fxcrt/css/cfx_cssstylesheet_unittest.cpp", "core/fxcrt/css/cfx_cssvaluelistparser_unittest.cpp", - "core/fxcrt/xml/cfx_xmlparser_unittest.cpp", "fxbarcode/oned/BC_OnedCodaBarWriter_unittest.cpp", "fxbarcode/oned/BC_OnedCode128Writer_unittest.cpp", "fxbarcode/oned/BC_OnedCode39Writer_unittest.cpp", -- cgit v1.2.3