From 0527ec571a8842b84f5161dc67f8da439e65eb12 Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 2 Dec 2016 10:53:30 -0800 Subject: Rename IFX_Stream to IFGAS_Stream. It's a separate hierarchy unrelated to the IFX_*Stream classes. Also rename CFX_Stream to CFGAS_Stream, and so forth. Review-Url: https://codereview.chromium.org/2535723010 --- xfa/fde/css/fde_css.h | 2 +- xfa/fde/css/fde_cssstylesheet.cpp | 4 ++-- xfa/fde/css/fde_cssstylesheet.h | 2 +- xfa/fde/css/fde_csssyntax.cpp | 4 ++-- xfa/fde/css/fde_csssyntax.h | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h index b9a0d2be5d..3c216290d2 100644 --- a/xfa/fde/css/fde_css.h +++ b/xfa/fde/css/fde_css.h @@ -751,7 +751,7 @@ class IFDE_CSSStyleSheet : public IFX_Retainable { static IFDE_CSSStyleSheet* LoadHTMLStandardStyleSheet(); static IFDE_CSSStyleSheet* LoadFromStream( const CFX_WideString& szUrl, - IFX_Stream* pStream, + IFGAS_Stream* pStream, uint16_t wCodePage, uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL); static IFDE_CSSStyleSheet* LoadFromBuffer( diff --git a/xfa/fde/css/fde_cssstylesheet.cpp b/xfa/fde/css/fde_cssstylesheet.cpp index e376aca399..9c91e43cce 100644 --- a/xfa/fde/css/fde_cssstylesheet.cpp +++ b/xfa/fde/css/fde_cssstylesheet.cpp @@ -49,7 +49,7 @@ IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadFromStream( const CFX_WideString& szUrl, - IFX_Stream* pStream, + IFGAS_Stream* pStream, uint16_t wCodePage, uint32_t dwMediaList) { CFDE_CSSStyleSheet* pStyleSheet = new CFDE_CSSStyleSheet(dwMediaList); @@ -144,7 +144,7 @@ IFDE_CSSRule* CFDE_CSSStyleSheet::GetRule(int32_t index) { } bool CFDE_CSSStyleSheet::LoadFromStream(const CFX_WideString& szUrl, - IFX_Stream* pStream, + IFGAS_Stream* pStream, uint16_t wCodePage) { std::unique_ptr pSyntax(new CFDE_CSSSyntaxParser); if (pStream->GetCodePage() != wCodePage) diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h index 7d3ec98844..2460959a97 100644 --- a/xfa/fde/css/fde_cssstylesheet.h +++ b/xfa/fde/css/fde_cssstylesheet.h @@ -111,7 +111,7 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { IFDE_CSSRule* GetRule(int32_t index) override; bool LoadFromStream(const CFX_WideString& szUrl, - IFX_Stream* pStream, + IFGAS_Stream* pStream, uint16_t wCodePage); bool LoadFromBuffer(const CFX_WideString& szUrl, const FX_WCHAR* pBuffer, diff --git a/xfa/fde/css/fde_csssyntax.cpp b/xfa/fde/css/fde_csssyntax.cpp index 27094e1376..bdad0155d5 100644 --- a/xfa/fde/css/fde_csssyntax.cpp +++ b/xfa/fde/css/fde_csssyntax.cpp @@ -35,7 +35,7 @@ CFDE_CSSSyntaxParser::~CFDE_CSSSyntaxParser() { m_TextPlane.Reset(); } -bool CFDE_CSSSyntaxParser::Init(IFX_Stream* pStream, +bool CFDE_CSSSyntaxParser::Init(IFGAS_Stream* pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize, bool bOnlyDeclaration) { @@ -433,7 +433,7 @@ bool CFDE_CSSTextBuf::EstimateSize(int32_t iAllocSize) { m_bExtBuf = false; return ExpandBuf(iAllocSize); } -int32_t CFDE_CSSTextBuf::LoadFromStream(IFX_Stream* pTxtStream, +int32_t CFDE_CSSTextBuf::LoadFromStream(IFGAS_Stream* pTxtStream, int32_t iStreamOffset, int32_t iMaxChars, bool& bEOS) { diff --git a/xfa/fde/css/fde_csssyntax.h b/xfa/fde/css/fde_csssyntax.h index c2c80c5e67..03662037d9 100644 --- a/xfa/fde/css/fde_csssyntax.h +++ b/xfa/fde/css/fde_csssyntax.h @@ -18,7 +18,7 @@ class CFDE_CSSTextBuf : public CFX_Target { bool AttachBuffer(const FX_WCHAR* pBuffer, int32_t iBufLen); bool EstimateSize(int32_t iAllocSize); - int32_t LoadFromStream(IFX_Stream* pTxtStream, + int32_t LoadFromStream(IFGAS_Stream* pTxtStream, int32_t iStreamOffset, int32_t iMaxChars, bool& bEOS); @@ -80,7 +80,7 @@ class CFDE_CSSSyntaxParser : public CFX_Target { CFDE_CSSSyntaxParser(); ~CFDE_CSSSyntaxParser() override; - bool Init(IFX_Stream* pStream, + bool Init(IFGAS_Stream* pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, bool bOnlyDeclaration = false); @@ -106,7 +106,7 @@ class CFDE_CSSSyntaxParser : public CFX_Target { bool IsImportEnabled() const; void DisableImport() { m_dwCheck = 0; } - IFX_Stream* m_pStream; + IFGAS_Stream* m_pStream; int32_t m_iStreamPos; int32_t m_iPlaneSize; CFDE_CSSTextBuf m_TextData; -- cgit v1.2.3