From ae2aec8712aa4c52454737467869b9d256baa05f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 18 Oct 2018 21:34:50 +0000 Subject: Do IWYU for core/fxcrt/xml headers. Also make more core/fxcrt/xml member variable names consistent in style. Change-Id: I892841b4026df302aa28f754441bf21707e96764 Reviewed-on: https://pdfium-review.googlesource.com/c/44171 Reviewed-by: Ryan Harrison Commit-Queue: Lei Zhang --- xfa/fxfa/cxfa_ffdoc.h | 1 - xfa/fxfa/parser/cxfa_document_parser.cpp | 1 + xfa/fxfa/parser/cxfa_document_parser.h | 6 ++++-- xfa/fxfa/parser/cxfa_document_parser_unittest.cpp | 1 + xfa/fxfa/parser/cxfa_node.cpp | 1 + xfa/fxfa/parser/cxfa_node.h | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h index 50888b8bde..1b7536c836 100644 --- a/xfa/fxfa/cxfa_ffdoc.h +++ b/xfa/fxfa/cxfa_ffdoc.h @@ -12,7 +12,6 @@ #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/unowned_ptr.h" -#include "core/fxcrt/xml/cfx_xmlnode.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index c6b3f54636..643695f34b 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -15,6 +15,7 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmlchardata.h" +#include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlinstruction.h" #include "core/fxcrt/xml/cfx_xmlnode.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser.h b/xfa/fxfa/parser/cxfa_document_parser.h index 064475aee3..28b8d61793 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.h +++ b/xfa/fxfa/parser/cxfa_document_parser.h @@ -10,10 +10,12 @@ #include #include -#include "core/fxcrt/xml/cfx_xmldocument.h" -#include "core/fxcrt/xml/cfx_xmlnode.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/retain_ptr.h" #include "xfa/fxfa/fxfa_basic.h" +class CFX_XMLDocument; +class CFX_XMLNode; class CXFA_Document; class CXFA_Node; class CFX_XMLInstruction; diff --git a/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp b/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp index 7af43e14ad..8024fb80d6 100644 --- a/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp @@ -5,6 +5,7 @@ #include "xfa/fxfa/parser/cxfa_document_parser.h" #include "core/fxcrt/cfx_readonlymemorystream.h" +#include "core/fxcrt/xml/cfx_xmldocument.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" #include "third_party/base/ptr_util.h" diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 1f44b05a4a..f11542c9ae 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -19,6 +19,7 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/locale_iface.h" +#include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlnode.h" #include "core/fxcrt/xml/cfx_xmltext.h" diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index ab06b4b4b7..e8311f42ff 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -12,7 +12,6 @@ #include #include "core/fxcrt/fx_string.h" -#include "core/fxcrt/xml/cfx_xmlnode.h" #include "core/fxge/fx_dib.h" #include "third_party/base/optional.h" #include "xfa/fxfa/cxfa_ffwidget.h" @@ -20,6 +19,7 @@ class CFGAS_GEFont; class CFX_DIBitmap; +class CFX_XMLNode; class CXFA_Bind; class CXFA_Border; class CXFA_Calculate; -- cgit v1.2.3