diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-28 06:34:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 06:34:24 -0700 |
| commit | e6ebf7af7ea94d48091be300cec84b499d3b8ae0 (patch) | |
| tree | 82d476bc07d65f39ecb32bebf2de45002cd2d37f /xfa/fxfa/app/xfa_textlayout.h | |
| parent | 3b5cb78353f92ad7d23ace4e452ed26acf9aeaa7 (diff) | |
| download | pdfium-e6ebf7af7ea94d48091be300cec84b499d3b8ae0.tar.xz | |
Cleanup IFDE_CSS interfaces.
This CL removes the follwing in favour of their concrete class.
* IFDE_CSSDeclaration
* IFDE_CSSSelector
* IFDE_CSSSyntaxParser
* IFDE_CSSStyleSelector
Review-Url: https://codereview.chromium.org/1928763002
Diffstat (limited to 'xfa/fxfa/app/xfa_textlayout.h')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index e823448105..bc6719a4df 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -17,6 +17,7 @@ #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 +class CFDE_CSSStyleSelector; class CXFA_Para; class CXFA_Font; class CXFA_TextProvider; @@ -63,15 +64,15 @@ class CXFA_TextParseContext : public CFX_Target { } void SetDisplay(FDE_CSSDISPLAY eDisplay) { m_eDisplay = eDisplay; } FDE_CSSDISPLAY GetDisplay() const { return m_eDisplay; } - void SetDecls(const IFDE_CSSDeclaration** ppDeclArray, int32_t iDeclCount); - const IFDE_CSSDeclaration** GetDecls() { - return (const IFDE_CSSDeclaration**)m_ppMatchedDecls; + void SetDecls(const CFDE_CSSDeclaration** ppDeclArray, int32_t iDeclCount); + const CFDE_CSSDeclaration** GetDecls() { + return const_cast<const CFDE_CSSDeclaration**>(m_ppMatchedDecls); } uint32_t CountDecls() const { return m_dwMatchedDecls; } IFDE_CSSComputedStyle* m_pParentStyle; protected: - IFDE_CSSDeclaration** m_ppMatchedDecls; + CFDE_CSSDeclaration** m_ppMatchedDecls; uint32_t m_dwMatchedDecls; FDE_CSSDISPLAY m_eDisplay; }; @@ -130,7 +131,7 @@ class CXFA_TextParser { IFDE_CSSStyleSheet* LoadDefaultSheetStyle(); IFDE_CSSComputedStyle* CreateStyle(IFDE_CSSComputedStyle* pParentStyle); IFX_MEMAllocator* m_pAllocator; - IFDE_CSSStyleSelector* m_pSelector; + CFDE_CSSStyleSelector* m_pSelector; IFDE_CSSStyleSheet* m_pUASheet; CFX_MapPtrTemplate<CFDE_XMLNode*, CXFA_TextParseContext*> m_mapXMLNodeToParseContext; |