Refcount all the IFX_ stream classes all the time.

We can remove a lot of "bOwnsStream" logic in the process.
Always pass these by const reference, in case the called method
wants to hang on to the stream (one exception is where we stick
a raw pointer into a void* slot in a context from another layer).

Review-Url: https://codereview.chromium.org/2451493002

1 files changed, 4 insertions, 5 deletions

diff --git a/core/fxcrt/xml_int.h b/core/fxcrt/xml_int.h
index f5beaef9ae..e617a777f3 100644
--- a/core/fxcrt/xml_int.h
+++ b/core/fxcrt/xml_int.h
@@ -20,9 +20,9 @@ class CXML_Parser {
   ~CXML_Parser();
 
   bool Init(uint8_t* pBuffer, size_t size);
-  bool Init(IFX_SeekableReadStream* pFileRead);
-  bool Init(IFX_BufferedReadStream* pBuffer);
-  bool Init(bool bOwndedStream);
+  bool Init(const CFX_RetainPtr<IFX_SeekableReadStream>& pFileRead);
+  bool Init(const CFX_RetainPtr<IFX_BufferedReadStream>& pBuffer);
+  bool Init();
   bool ReadNextBlock();
   bool IsEOF();
   bool HaveAvailData();
@@ -41,8 +41,7 @@ class CXML_Parser {
                             CXML_Element* pElement);
   void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
 
-  IFX_BufferedReadStream* m_pDataAcc;
-  bool m_bOwnedStream;
+  CFX_RetainPtr<IFX_BufferedReadStream> m_pDataAcc;
   FX_FILESIZE m_nOffset;
   bool m_bSaveSpaceChars;
   const uint8_t* m_pBuffer;