diff --git a/BUILD.gn b/BUILD.gn
index 6a02aeb..560c86c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -133,9 +133,7 @@
   ]
 
   if (pdf_enable_xfa) {
-    deps += [
-      ":fpdfxfa",
-    ]
+    deps += [ ":fpdfxfa" ]
   }
 
   if (is_win) {
@@ -757,20 +755,23 @@
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h",
+      "fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp",
+      "fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp",
+      "fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp",
+      "fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp",
     ]
     deps = [
       ":xfa",
     ]
     configs -= [ "//build/config/compiler:chromium_code" ]
-    configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+    configs += [
+      ":pdfium_config",
+      "//build/config/compiler:no_chromium_code",
+    ]
   }
 
   static_library("xfa") {
@@ -903,9 +904,9 @@
       "xfa/src/fee/src/fee/fde_txtedtpage.h",
       "xfa/src/fee/src/fee/fde_txtedtparag.cpp",
       "xfa/src/fee/src/fee/fde_txtedtparag.h",
-      "xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp",
       "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp",
       "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h",
+      "xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp",
       "xfa/src/fgas/include/fgas.h",
       "xfa/src/fgas/include/fx_alg.h",
       "xfa/src/fgas/include/fx_cpg.h",
@@ -1033,246 +1034,248 @@
       "xfa/src/fwl/src/theme/pushbuttontp.cpp",
       "xfa/src/fwl/src/theme/scrollbartp.cpp",
       "xfa/src/fwl/src/theme/widgettp.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonBitArray.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonBitSource.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonByteArray.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonECI.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp",
-      "xfa/src/fxbarcode/common/BC_CommonBitArray.h",
-      "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h",
-      "xfa/src/fxbarcode/common/BC_CommonBitSource.h",
-      "xfa/src/fxbarcode/common/BC_CommonByteArray.h",
-      "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h",
-      "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h",
-      "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h",
-      "xfa/src/fxbarcode/common/BC_CommonECI.h",
-      "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h",
-      "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp",
-      "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h",
-      "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp",
-      "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h",
-      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h",
-      "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp",
-      "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h",
-      "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h",
-      "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h",
-      "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h",
-      "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h",
-      "xfa/src/fxbarcode/datamatrix/BC_Encoder.h",
-      "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp",
-      "xfa/src/fxbarcode/oned/BC_OneDimReader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp",
-      "xfa/src/fxbarcode/oned/BC_OneDReader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp",
-      "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h",
-      "xfa/src/fxbarcode/oned/BC_OneDimReader.h",
-      "xfa/src/fxbarcode/oned/BC_OneDimWriter.h",
-      "xfa/src/fxbarcode/oned/BC_OneDReader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h",
-      "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h",
-      "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoder.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRDetector.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h",
-      "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h",
-      "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp",
-      "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h",
       "xfa/src/fxbarcode/BC_BarCode.cpp",
       "xfa/src/fxbarcode/BC_Binarizer.cpp",
-      "xfa/src/fxbarcode/BC_BinaryBitmap.cpp",
-      "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp",
-      "xfa/src/fxbarcode/BC_Dimension.cpp",
-      "xfa/src/fxbarcode/BC_Library.cpp",
-      "xfa/src/fxbarcode/BC_LuminanceSource.cpp",
-      "xfa/src/fxbarcode/BC_Reader.cpp",
-      "xfa/src/fxbarcode/BC_ResultPoint.cpp",
-      "xfa/src/fxbarcode/BC_TwoDimWriter.cpp",
-      "xfa/src/fxbarcode/BC_UtilCodingConvert.cpp",
-      "xfa/src/fxbarcode/BC_UtilRSS.cpp",
-      "xfa/src/fxbarcode/BC_Utils.cpp",
-      "xfa/src/fxbarcode/BC_Writer.cpp",
       "xfa/src/fxbarcode/BC_Binarizer.h",
+      "xfa/src/fxbarcode/BC_BinaryBitmap.cpp",
       "xfa/src/fxbarcode/BC_BinaryBitmap.h",
+      "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp",
       "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h",
       "xfa/src/fxbarcode/BC_DecoderResult.h",
+      "xfa/src/fxbarcode/BC_Dimension.cpp",
       "xfa/src/fxbarcode/BC_Dimension.h",
+      "xfa/src/fxbarcode/BC_Library.cpp",
+      "xfa/src/fxbarcode/BC_LuminanceSource.cpp",
       "xfa/src/fxbarcode/BC_LuminanceSource.h",
+      "xfa/src/fxbarcode/BC_Reader.cpp",
       "xfa/src/fxbarcode/BC_Reader.h",
+      "xfa/src/fxbarcode/BC_ResultPoint.cpp",
       "xfa/src/fxbarcode/BC_ResultPoint.h",
+      "xfa/src/fxbarcode/BC_TwoDimWriter.cpp",
       "xfa/src/fxbarcode/BC_TwoDimWriter.h",
+      "xfa/src/fxbarcode/BC_UtilCodingConvert.cpp",
       "xfa/src/fxbarcode/BC_UtilCodingConvert.h",
+      "xfa/src/fxbarcode/BC_UtilRSS.cpp",
       "xfa/src/fxbarcode/BC_UtilRSS.h",
+      "xfa/src/fxbarcode/BC_Utils.cpp",
+      "xfa/src/fxbarcode/BC_Writer.cpp",
       "xfa/src/fxbarcode/BC_Writer.h",
       "xfa/src/fxbarcode/barcode.h",
+      "xfa/src/fxbarcode/common/BC_CommonBitArray.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonBitArray.h",
+      "xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h",
+      "xfa/src/fxbarcode/common/BC_CommonBitSource.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonBitSource.h",
+      "xfa/src/fxbarcode/common/BC_CommonByteArray.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonByteArray.h",
+      "xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h",
+      "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h",
+      "xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h",
+      "xfa/src/fxbarcode/common/BC_CommonECI.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonECI.h",
+      "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp",
+      "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h",
+      "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp",
+      "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h",
+      "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp",
+      "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp",
+      "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h",
+      "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h",
+      "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h",
+      "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_Encoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h",
+      "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h",
+      "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h",
+      "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h",
+      "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h",
+      "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp",
+      "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h",
+      "xfa/src/fxbarcode/oned/BC_OneDReader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OneDReader.h",
+      "xfa/src/fxbarcode/oned/BC_OneDimReader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OneDimReader.h",
+      "xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp",
+      "xfa/src/fxbarcode/oned/BC_OneDimWriter.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h",
+      "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h",
+      "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp",
+      "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp",
+      "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h",
+      "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoder.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRDetector.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h",
+      "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp",
+      "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h",
       "xfa/src/fxbarcode/utils.h",
       "xfa/src/fxfa/src/app/xfa_checksum.cpp",
       "xfa/src/fxfa/src/app/xfa_checksum.h",
+      "xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp",
+      "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h",
       "xfa/src/fxfa/src/app/xfa_ffapp.cpp",
       "xfa/src/fxfa/src/app/xfa_ffapp.h",
       "xfa/src/fxfa/src/app/xfa_ffbarcode.cpp",
@@ -1281,8 +1284,6 @@
       "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h",
       "xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp",
       "xfa/src/fxfa/src/app/xfa_ffchoicelist.h",
-      "xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp",
-      "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h",
       "xfa/src/fxfa/src/app/xfa_ffdoc.cpp",
       "xfa/src/fxfa/src/app/xfa_ffdoc.h",
       "xfa/src/fxfa/src/app/xfa_ffdochandler.cpp",
@@ -1380,8 +1381,8 @@
       "xfa/src/fxfa/src/parser/xfa_locale.h",
       "xfa/src/fxfa/src/parser/xfa_localemgr.cpp",
       "xfa/src/fxfa/src/parser/xfa_localevalue.cpp",
-      "xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp",
       "xfa/src/fxfa/src/parser/xfa_object_imp.cpp",
+      "xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp",
       "xfa/src/fxfa/src/parser/xfa_parser_imp.cpp",
       "xfa/src/fxfa/src/parser/xfa_parser_imp.h",
       "xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp",
@@ -1408,9 +1409,7 @@
       "xfa/src/fxgraphics/src/fx_path_generator.h",
       "xfa/src/fxgraphics/src/pre.h",
     ]
-    include_dirs = [
-      ".",
-    ]
+    include_dirs = [ "." ]
     if (pdf_enable_v8) {
       sources += [
         "xfa/src/fxjse/src/class.cpp",
@@ -1423,7 +1422,7 @@
         "xfa/src/fxjse/src/scope_inline.h",
         "xfa/src/fxjse/src/util_inline.h",
         "xfa/src/fxjse/src/value.cpp",
-        "xfa/src/fxjse/src/value.h"
+        "xfa/src/fxjse/src/value.h",
       ]
       include_dirs += [
         "//v8",