Remove Release() from CFX_RTFBreak

xfa/fxfa/app/xfa_textlayout.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
 #define XFA_FXFA_APP_XFA_TEXTLAYOUT_H_
 
 #include <map>
@@ skipping 69 matching lines @@
 
 class CXFA_TextParser {
  public:
   CXFA_TextParser();
   virtual ~CXFA_TextParser();
   void Reset();
   void DoParse(CFDE_XMLNode* pXMLContainer, CXFA_TextProvider* pTextProvider);
   IFDE_CSSComputedStyle* CreateRootStyle(CXFA_TextProvider* pTextProvider);
   IFDE_CSSComputedStyle* ComputeStyle(CFDE_XMLNode* pXMLNode,
                                       IFDE_CSSComputedStyle* pParentStyle);
-  FX_BOOL IsParsed() const { return m_pAllocator != NULL; }
+  FX_BOOL IsParsed() const { return !!m_pAllocator; }
 
   int32_t GetVAlign(CXFA_TextProvider* pTextProvider) const;
   FX_FLOAT GetTabInterval(IFDE_CSSComputedStyle* pStyle) const;
   int32_t CountTabs(IFDE_CSSComputedStyle* pStyle) const;
   FX_BOOL IsSpaceRun(IFDE_CSSComputedStyle* pStyle) const;
   FX_BOOL GetTabstops(IFDE_CSSComputedStyle* pStyle,
                       CXFA_TextTabstopsContext* pTabstopContext);
   IFX_Font* GetFont(CXFA_TextProvider* pTextProvider,
                     IFDE_CSSComputedStyle* pStyle) const;
   FX_FLOAT GetFontSize(CXFA_TextProvider* pTextProvider,
@@ skipping 26 matching lines @@
  protected:
   bool TagValidate(const CFX_WideString& str) const;
 
  private:
   void InitCSSData(CXFA_TextProvider* pTextProvider);
   void ParseRichText(CFDE_XMLNode* pXMLNode,
                      IFDE_CSSComputedStyle* pParentStyle);
   void ParseTagInfo(CFDE_XMLNode* pXMLNode, CXFA_CSSTagProvider& tagProvider);
   IFDE_CSSStyleSheet* LoadDefaultSheetStyle();
   IFDE_CSSComputedStyle* CreateStyle(IFDE_CSSComputedStyle* pParentStyle);
-  IFX_MemoryAllocator* m_pAllocator;
+  std::unique_ptr<IFX_MemoryAllocator> m_pAllocator;
   std::unique_ptr<CFDE_CSSStyleSelector> m_pSelector;
   IFDE_CSSStyleSheet* m_pUASheet;
   CFX_MapPtrTemplate<CFDE_XMLNode*, CXFA_TextParseContext*>
       m_mapXMLNodeToParseContext;
 };
 
 class CXFA_LoaderContext {
  public:
   CXFA_LoaderContext()
       : m_bSaveLineHeight(FALSE),
@@ skipping 22 matching lines @@
   uint32_t m_dwFlags;
   CFX_FloatArray m_BlocksHeight;
 };
 
 class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
  public:
   CXFA_LinkUserData(IFX_MemoryAllocator* pAllocator, FX_WCHAR* pszText)
       : m_pAllocator(pAllocator), m_dwRefCount(1) {
     m_pszURLContent = pszText;
   }
   ~CXFA_LinkUserData() {}

[Lei Zhang, 2016/05/20 23:00:52]

needs override

[Tom Sepez, 2016/05/20 23:07:29]

Done.

   virtual uint32_t Release() {
     uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount <= 0) {
       FXTARGET_DeleteWith(CXFA_LinkUserData, m_pAllocator, this);
     }
     return dwRefCount;
   }
   virtual uint32_t AddRef() { return ++m_dwRefCount; }
 
   const FX_WCHAR* GetLinkURL() { return m_pszURLContent.c_str(); }
@@ skipping 20 matching lines @@
                     IFDE_CSSComputedStyle* pStyle,
                     CXFA_LinkUserData* pLinkData)
       : m_pStyle(pStyle),
         m_pLinkData(pLinkData),
         m_pAllocator(pAllocator),
         m_dwRefCount(0) {
     ASSERT(m_pAllocator);
     if (m_pStyle)
       m_pStyle->AddRef();
   }
   ~CXFA_TextUserData() {

[Lei Zhang, 2016/05/20 23:00:52]

needs override

[Tom Sepez, 2016/05/20 23:07:29]

Done.

     if (m_pStyle)
       m_pStyle->Release();
     if (m_pLinkData)
       m_pLinkData->Release();
   }
   virtual uint32_t Release() {
     uint32_t dwRefCount = --m_dwRefCount;
     if (dwRefCount == 0) {
       FXTARGET_DeleteWith(CXFA_TextUserData, m_pAllocator, this);
     }
     return dwRefCount;
   }
   virtual uint32_t AddRef() { return ++m_dwRefCount; }
 
   IFDE_CSSComputedStyle* m_pStyle;
   CXFA_LinkUserData* m_pLinkData;
 
  protected:
   IFX_MemoryAllocator* m_pAllocator;
   uint32_t m_dwRefCount;
 };
 
 class XFA_TextPiece : public CFX_Target {
  public:
   XFA_TextPiece() : pszText(nullptr), pFont(nullptr), pLinkData(nullptr) {}
   ~XFA_TextPiece() {

[Lei Zhang, 2016/05/20 23:00:52]

needs override

[Tom Sepez, 2016/05/20 23:07:29]

Done.

     if (pLinkData)
       pLinkData->Release();
   }
 
   FX_WCHAR* pszText;
   int32_t iChars;
   int32_t* pWidths;
   int32_t iHorScale;
   int32_t iVerScale;
   int32_t iBidiLevel;
@@ skipping 57 matching lines @@
   CFX_ArrayTemplate<XFA_TABSTOPS> m_tabstops;
   int32_t m_iTabCount;
   int32_t m_iTabIndex;
   FX_BOOL m_bTabstops;
   FX_FLOAT m_fTabWidth;
   FX_FLOAT m_fLeft;
 };
 
 class CXFA_TextLayout {
  public:
   CXFA_TextLayout(CXFA_TextProvider* pTextProvider);

[Lei Zhang, 2016/05/20 23:00:52]

explicit

   virtual ~CXFA_TextLayout();

[Lei Zhang, 2016/05/20 23:00:52]

No need to be virtual.

[Tom Sepez, 2016/05/20 23:07:29]

Done.

+
   int32_t GetText(CFX_WideString& wsText);
   FX_FLOAT GetLayoutHeight();
   FX_FLOAT StartLayout(FX_FLOAT fWidth = -1);
   FX_BOOL DoLayout(int32_t iBlockIndex,
                    FX_FLOAT& fCalcHeight,
                    FX_FLOAT fContentAreaHeight = -1,
                    FX_FLOAT fTextHeight = -1);
 
   FX_BOOL CalcSize(const CFX_SizeF& minSize,
                    const CFX_SizeF& maxSize,
@@ skipping 65 matching lines @@
                         FXTEXT_CHARPOS* pCharPos,
                         FX_BOOL bCharCode = FALSE);
   FX_BOOL ToRun(const XFA_TextPiece* pPiece, FX_RTFTEXTOBJ& tr);
   void DoTabstops(IFDE_CSSComputedStyle* pStyle, CXFA_PieceLine* pPieceLine);
   FX_BOOL Layout(int32_t iBlock);
   int32_t CountBlocks() const;
 
   CXFA_TextProvider* m_pTextProvider;
   CXFA_Node* m_pTextDataNode;
   FX_BOOL m_bRichText;
-  IFX_MemoryAllocator* m_pAllocator;
-  CFX_RTFBreak* m_pBreak;
-  CXFA_LoaderContext* m_pLoader;
+  std::unique_ptr<IFX_MemoryAllocator> m_pAllocator;
+  std::unique_ptr<CFX_RTFBreak> m_pBreak;
+  std::unique_ptr<CXFA_LoaderContext> m_pLoader;
   int32_t m_iLines;
   FX_FLOAT m_fMaxWidth;
   CXFA_TextParser m_textParser;
   CXFA_PieceLineArray m_pieceLines;
-  CXFA_TextTabstopsContext* m_pTabstopContext;
+  std::unique_ptr<CXFA_TextTabstopsContext> m_pTabstopContext;
   FX_BOOL m_bBlockContinue;
 };
 
 #endif  // XFA_FXFA_APP_XFA_TEXTLAYOUT_H_