From ddb7016e69d99bb9355420b49a0ee864e2b7fe15 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 30 Mar 2017 14:01:31 -0400
Subject: Move CFX files into fxcrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This Cl moves more of the CFX classes defined in the xfa/ directory to
the core/fxcrt directory and conditionally builds them.

Change-Id: I811e6c6acd31dfbe75b49880be43661f78334013
Reviewed-on: https://pdfium-review.googlesource.com/3372
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 BUILD.gn | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'BUILD.gn')

diff --git a/BUILD.gn b/BUILD.gn
index cd3c724eb9..6018890fa4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -805,13 +805,25 @@ static_library("fxcrt") {
     sources += [
       "core/fxcrt/cfx_char.cpp",
       "core/fxcrt/cfx_char.h",
+      "core/fxcrt/cfx_chariter.cpp",
+      "core/fxcrt/cfx_chariter.h",
+      "core/fxcrt/cfx_checksumcontext.cpp",
+      "core/fxcrt/cfx_checksumcontext.h",
       "core/fxcrt/cfx_datetime.cpp",
       "core/fxcrt/cfx_datetime.h",
       "core/fxcrt/cfx_decimal.cpp",
       "core/fxcrt/cfx_decimal.h",
+      "core/fxcrt/cfx_wordbreak.cpp",
+      "core/fxcrt/cfx_wordbreak.h",
       "core/fxcrt/fx_arabic.cpp",
       "core/fxcrt/fx_arabic.h",
+      "core/fxcrt/ifx_chariter.h",
       "core/fxcrt/ifx_locale.h",
+      "core/fxcrt/xml/cfx_saxcontext.h",
+      "core/fxcrt/xml/cfx_saxreader.cpp",
+      "core/fxcrt/xml/cfx_saxreader.h",
+      "core/fxcrt/xml/cfx_saxreaderhandler.cpp",
+      "core/fxcrt/xml/cfx_saxreaderhandler.h",
     ]
   }
 }
@@ -1322,10 +1334,6 @@ if (pdf_enable_xfa) {
       "xfa/fde/cfde_txtedttextset.h",
       "xfa/fde/cfde_visualsetiterator.cpp",
       "xfa/fde/cfde_visualsetiterator.h",
-      "xfa/fde/cfx_chariter.cpp",
-      "xfa/fde/cfx_chariter.h",
-      "xfa/fde/cfx_wordbreak.cpp",
-      "xfa/fde/cfx_wordbreak.h",
       "xfa/fde/css/cfde_csscolorvalue.cpp",
       "xfa/fde/css/cfde_csscolorvalue.h",
       "xfa/fde/css/cfde_csscomputedstyle.cpp",
@@ -1368,11 +1376,8 @@ if (pdf_enable_xfa) {
       "xfa/fde/ifde_txtedtdorecord.h",
       "xfa/fde/ifde_txtedtengine.h",
       "xfa/fde/ifde_txtedtpage.h",
-      "xfa/fde/ifx_chariter.h",
       "xfa/fde/tto/fde_textout.cpp",
       "xfa/fde/tto/fde_textout.h",
-      "xfa/fde/xml/cfx_saxreader.cpp",
-      "xfa/fde/xml/cfx_saxreader.h",
       "xfa/fde/xml/fde_xml.h",
       "xfa/fde/xml/fde_xml_imp.cpp",
       "xfa/fde/xml/fde_xml_imp.h",
@@ -1576,8 +1581,6 @@ if (pdf_enable_xfa) {
       "xfa/fxfa/app/xfa_fwltheme.h",
       "xfa/fxfa/app/xfa_textpiece.cpp",
       "xfa/fxfa/app/xfa_textpiece.h",
-      "xfa/fxfa/cxfa_checksumcontext.cpp",
-      "xfa/fxfa/cxfa_checksumcontext.h",
       "xfa/fxfa/cxfa_deffontmgr.cpp",
       "xfa/fxfa/cxfa_deffontmgr.h",
       "xfa/fxfa/cxfa_eventparam.cpp",
@@ -1602,9 +1605,6 @@ if (pdf_enable_xfa) {
       "xfa/fxfa/cxfa_pdffontmgr.h",
       "xfa/fxfa/cxfa_rendercontext.cpp",
       "xfa/fxfa/cxfa_rendercontext.h",
-      "xfa/fxfa/cxfa_saxcontext.h",
-      "xfa/fxfa/cxfa_saxreaderhandler.cpp",
-      "xfa/fxfa/cxfa_saxreaderhandler.h",
       "xfa/fxfa/cxfa_widgetacc.cpp",
       "xfa/fxfa/cxfa_widgetacc.h",
       "xfa/fxfa/cxfa_widgetacciterator.cpp",
-- 
cgit v1.2.3