Moar _CAPS work, part 3.

xfa/src/fxfa/src/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_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
 #define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_
 
 #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001
@@ skipping 207 matching lines @@
   }
   virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
 
   IFDE_CSSComputedStyle* m_pStyle;
   CXFA_LinkUserData* m_pLinkData;
 
  protected:
   IFX_MEMAllocator* m_pAllocator;
   FX_DWORD m_dwRefCount;
 };
-typedef struct _XFA_TEXTPIECE : public CFX_Target {
+
+struct XFA_TEXTPIECE : public CFX_Target {
+  XFA_TEXTPIECE() : pszText(NULL), pFont(NULL), pLinkData(NULL) {}

[Lei Zhang, 2016/02/23 20:42:05]

nullptr

+  ~XFA_TEXTPIECE() {
+    if (pLinkData)
+      pLinkData->Release();
+  }
+
   FX_WCHAR* pszText;
   int32_t iChars;
   int32_t* pWidths;
   int32_t iHorScale;
   int32_t iVerScale;
   int32_t iBidiLevel;
   int32_t iUnderline;
   int32_t iPeriod;
   int32_t iLineThrough;
   IFX_Font* pFont;
   FX_ARGB dwColor;
   FX_FLOAT fFontSize;
   CFX_RectF rtPiece;
   CXFA_LinkUserData* pLinkData;
+};
+typedef CFX_ArrayTemplate<XFA_TEXTPIECE*> CXFA_PieceArray;
 
-  _XFA_TEXTPIECE() : pszText(NULL), pFont(NULL), pLinkData(NULL) {
-    pszText = NULL;
-  }
-  ~_XFA_TEXTPIECE() {
-    pszText = NULL;
-    if (NULL != pLinkData) {
-      pLinkData->Release();
-      pLinkData = NULL;
-    }
-  }
-} XFA_TEXTPIECE, *XFA_LPTEXTPIECE;
-typedef XFA_TEXTPIECE const* XFA_LPCTEXTPIECE;
-typedef CFX_ArrayTemplate<XFA_LPTEXTPIECE> CXFA_PieceArray;
 class CXFA_PieceLine : public CFX_Target {
  public:
   CXFA_PieceLine() {}
   CXFA_PieceArray m_textPieces;
   CFX_Int32Array m_charCounts;
 };
 typedef CFX_ArrayTemplate<CXFA_PieceLine*> CXFA_PieceLineArray;
 struct XFA_TABSTOPS {
   FX_DWORD dwAlign;
   FX_FLOAT fTabstops;
@@ skipping 109 matching lines @@
                     CXFA_PieceLine* pPieceLine,
                     int32_t iPiece,
                     FXTEXT_CHARPOS* pCharPos,
                     const CFX_Matrix& tmDoc2Device);
   void RenderPath(IFDE_RenderDevice* pDevice,
                   IFDE_Pen* pPen,
                   CXFA_PieceLine* pPieceLine,
                   int32_t iPiece,
                   FXTEXT_CHARPOS* pCharPos,
                   const CFX_Matrix& tmDoc2Device);
-  int32_t GetDisplayPos(XFA_LPCTEXTPIECE pPiece,
+  int32_t GetDisplayPos(const XFA_TEXTPIECE* pPiece,
                         FXTEXT_CHARPOS* pCharPos,
                         FX_BOOL bCharCode = FALSE);
-  FX_BOOL ToRun(XFA_LPCTEXTPIECE pPiece, FX_RTFTEXTOBJ& tr);
+  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;
 
   IXFA_TextProvider* m_pTextProvider;
   CXFA_Node* m_pTextDataNode;
   FX_BOOL m_bRichText;
   IFX_MEMAllocator* m_pAllocator;
   IFX_RTFBreak* m_pBreak;
   CXFA_LoaderContext* m_pLoader;
   int32_t m_iLines;
   FX_FLOAT m_fMaxWidth;
   CXFA_TextParser m_textParser;
   CXFA_PieceLineArray m_pieceLines;
   CXFA_TextTabstopsContext* m_pTabstopContext;
   FX_BOOL m_bBlockContinue;
 };
 
 #endif  // XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_