From 0d86ecb08e1b2c204333b1f1f6b0b014e5b2971c Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Wed, 19 Apr 2017 09:19:57 -0400
Subject: Move fde XML parser to core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This CL moves the XML parser from FDE into FXCRT and renames to CFX_
from CFDE_.

Change-Id: I21a9590bf74daf5517df630d7e7a5de89da99ea4
Reviewed-on: https://pdfium-review.googlesource.com/4312
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
---
 xfa/fxfa/app/cxfa_textparser.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'xfa/fxfa/app/cxfa_textparser.h')

diff --git a/xfa/fxfa/app/cxfa_textparser.h b/xfa/fxfa/app/cxfa_textparser.h
index 29f03a8dea..04bd51fafe 100644
--- a/xfa/fxfa/app/cxfa_textparser.h
+++ b/xfa/fxfa/app/cxfa_textparser.h
@@ -19,7 +19,7 @@
 class CFDE_CSSComputedStyle;
 class CFDE_CSSStyleSelector;
 class CFDE_CSSStyleSheet;
-class CFDE_XMLNode;
+class CFX_XMLNode;
 class CXFA_CSSTagProvider;
 class CXFA_TextParseContext;
 class CXFA_TextProvider;
@@ -31,12 +31,12 @@ class CXFA_TextParser {
   virtual ~CXFA_TextParser();
 
   void Reset();
-  void DoParse(CFDE_XMLNode* pXMLContainer, CXFA_TextProvider* pTextProvider);
+  void DoParse(CFX_XMLNode* pXMLContainer, CXFA_TextProvider* pTextProvider);
 
   CFX_RetainPtr<CFDE_CSSComputedStyle> CreateRootStyle(
       CXFA_TextProvider* pTextProvider);
   CFX_RetainPtr<CFDE_CSSComputedStyle> ComputeStyle(
-      CFDE_XMLNode* pXMLNode,
+      CFX_XMLNode* pXMLNode,
       CFDE_CSSComputedStyle* pParentStyle);
 
   bool IsParsed() const { return m_bParsed; }
@@ -57,7 +57,7 @@ class CXFA_TextParser {
 
   int32_t GetHorScale(CXFA_TextProvider* pTextProvider,
                       CFDE_CSSComputedStyle* pStyle,
-                      CFDE_XMLNode* pXMLNode) const;
+                      CFX_XMLNode* pXMLNode) const;
   int32_t GetVerScale(CXFA_TextProvider* pTextProvider,
                       CFDE_CSSComputedStyle* pStyle) const;
 
@@ -78,18 +78,18 @@ class CXFA_TextParser {
                       float fVerScale) const;
 
   bool GetEmbbedObj(CXFA_TextProvider* pTextProvider,
-                    CFDE_XMLNode* pXMLNode,
+                    CFX_XMLNode* pXMLNode,
                     CFX_WideString& wsValue);
-  CXFA_TextParseContext* GetParseContextFromMap(CFDE_XMLNode* pXMLNode);
+  CXFA_TextParseContext* GetParseContextFromMap(CFX_XMLNode* pXMLNode);
 
  protected:
   bool TagValidate(const CFX_WideString& str) const;
 
  private:
   void InitCSSData(CXFA_TextProvider* pTextProvider);
-  void ParseRichText(CFDE_XMLNode* pXMLNode,
+  void ParseRichText(CFX_XMLNode* pXMLNode,
                      CFDE_CSSComputedStyle* pParentStyle);
-  std::unique_ptr<CXFA_CSSTagProvider> ParseTagInfo(CFDE_XMLNode* pXMLNode);
+  std::unique_ptr<CXFA_CSSTagProvider> ParseTagInfo(CFX_XMLNode* pXMLNode);
   std::unique_ptr<CFDE_CSSStyleSheet> LoadDefaultSheetStyle();
   CFX_RetainPtr<CFDE_CSSComputedStyle> CreateStyle(
       CFDE_CSSComputedStyle* pParentStyle);
@@ -97,7 +97,7 @@ class CXFA_TextParser {
   bool m_bParsed;
   bool m_cssInitialized;
   std::unique_ptr<CFDE_CSSStyleSelector> m_pSelector;
-  std::map<CFDE_XMLNode*, std::unique_ptr<CXFA_TextParseContext>>
+  std::map<CFX_XMLNode*, std::unique_ptr<CXFA_TextParseContext>>
       m_mapXMLNodeToParseContext;
 };
 
-- 
cgit v1.2.3