diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-23 13:54:53 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-23 19:48:54 +0000 |
| commit | 6414b273506f97012f82c8a32c020b483d5df31a (patch) | |
| tree | f790a25f03e78fe084ee22cb16418d95deaf3dd3 /xfa/fde/css/cfde_cssstylesheet.h | |
| parent | a0b2d23d1121202d3821291483943a47a3c9e32e (diff) | |
| download | pdfium-6414b273506f97012f82c8a32c020b483d5df31a.tar.xz | |
Cleanup CSS parsing
This Cl removes unused CSS parsing code. The only caller of
CFDE_CSSStyleSheet::LoadeBuffer is from CXFA_TextParser which provides a static
string. So, we know there are no Media rules, Import rules, FontFace rules or
Page rules in the input style. These rules are also not allowed in inline
styles. This CL removes the supporting code.
Change-Id: I3a559352b2dd0769c465cbd3da40d1db5f9577b0
Reviewed-on: https://pdfium-review.googlesource.com/2330
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde/css/cfde_cssstylesheet.h')
| -rw-r--r-- | xfa/fde/css/cfde_cssstylesheet.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/xfa/fde/css/cfde_cssstylesheet.h b/xfa/fde/css/cfde_cssstylesheet.h index 2268efa2e4..8bbcc485bb 100644 --- a/xfa/fde/css/cfde_cssstylesheet.h +++ b/xfa/fde/css/cfde_cssstylesheet.h @@ -15,7 +15,7 @@ #include "core/fxcrt/fx_string.h" #include "xfa/fde/css/cfde_csssyntaxparser.h" -class CFDE_CSSRule; +class CFDE_CSSStyleRule; class CFDE_CSSStyleSheet : public IFX_Retainable { public: @@ -26,29 +26,20 @@ class CFDE_CSSStyleSheet : public IFX_Retainable { uint32_t Retain() override; uint32_t Release() override; - bool LoadFromBuffer(const FX_WCHAR* pBuffer, int32_t iBufSize); + bool LoadBuffer(const FX_WCHAR* pBuffer, int32_t iBufSize); - uint32_t GetMediaList() const; int32_t CountRules() const; - CFDE_CSSRule* GetRule(int32_t index); + CFDE_CSSStyleRule* GetRule(int32_t index); private: void Reset(); - bool LoadFromSyntax(CFDE_CSSSyntaxParser* pSyntax); FDE_CSSSyntaxStatus LoadStyleRule( CFDE_CSSSyntaxParser* pSyntax, - std::vector<std::unique_ptr<CFDE_CSSRule>>* ruleArray); - FDE_CSSSyntaxStatus LoadImportRule(CFDE_CSSSyntaxParser* pSyntax); - FDE_CSSSyntaxStatus LoadPageRule(CFDE_CSSSyntaxParser* pSyntax); - FDE_CSSSyntaxStatus LoadMediaRule(CFDE_CSSSyntaxParser* pSyntax); - FDE_CSSSyntaxStatus LoadFontFaceRule( - CFDE_CSSSyntaxParser* pSyntax, - std::vector<std::unique_ptr<CFDE_CSSRule>>* ruleArray); - FDE_CSSSyntaxStatus SkipRuleSet(CFDE_CSSSyntaxParser* pSyntax); + std::vector<std::unique_ptr<CFDE_CSSStyleRule>>* ruleArray); + void SkipRuleSet(CFDE_CSSSyntaxParser* pSyntax); uint16_t m_wRefCount; - uint32_t m_dwMediaList; - std::vector<std::unique_ptr<CFDE_CSSRule>> m_RuleArray; + std::vector<std::unique_ptr<CFDE_CSSStyleRule>> m_RuleArray; std::unordered_map<uint32_t, FX_WCHAR*> m_StringCache; }; |