From a2d699f1462050833f959ebcf24853c2a6a10f72 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Mon, 23 May 2016 17:19:20 -0700
Subject: Rename IFX_Unknown to IFX_Retainable.

Rename addRef() method to Retain() to match Release().
This CL does not convert to CFX_RetainPtrs, which will happen
in a follow-on.

Review-Url: https://codereview.chromium.org/2005933002
---
 xfa/fgas/layout/fgas_rtfbreak.cpp |  8 ++++----
 xfa/fgas/layout/fgas_rtfbreak.h   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'xfa/fgas/layout')

diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp
index 62b3f5f28e..dcb3c3953a 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/fgas_rtfbreak.cpp
@@ -239,7 +239,7 @@ void CFX_RTFBreak::SetAlignment(int32_t iAlignment) {
          iAlignment <= FX_RTFLINEALIGNMENT_Distributed);
   m_iAlignment = iAlignment;
 }
-void CFX_RTFBreak::SetUserData(IFX_Unknown* pUserData) {
+void CFX_RTFBreak::SetUserData(IFX_Retainable* pUserData) {
   if (m_pUserData == pUserData) {
     return;
   }
@@ -249,7 +249,7 @@ void CFX_RTFBreak::SetUserData(IFX_Unknown* pUserData) {
   }
   m_pUserData = pUserData;
   if (m_pUserData != NULL) {
-    m_pUserData->AddRef();
+    m_pUserData->Retain();
   }
 }
 static const int32_t gs_FX_RTFLineRotations[8] = {0, 3, 1, 0, 2, 1, 3, 2};
@@ -362,7 +362,7 @@ uint32_t CFX_RTFBreak::AppendChar(FX_WCHAR wch) {
   pCurChar->m_iCharWidth = 0;
   pCurChar->m_dwIdentity = m_dwIdentity;
   if (m_pUserData != NULL) {
-    m_pUserData->AddRef();
+    m_pUserData->Retain();
   }
   pCurChar->m_pUserData = m_pUserData;
   uint32_t dwRet1 = FX_RTFBREAK_None;
@@ -409,7 +409,7 @@ uint32_t CFX_RTFBreak::AppendChar_CharCode(FX_WCHAR wch) {
   pCurChar->m_iCharWidth = 0;
   pCurChar->m_dwIdentity = m_dwIdentity;
   if (m_pUserData != NULL) {
-    m_pUserData->AddRef();
+    m_pUserData->Retain();
   }
   pCurChar->m_pUserData = m_pUserData;
   int32_t iCharWidth = 0;
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index be3717f584..c090a0dd5d 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -7,6 +7,7 @@
 #ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
 #define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_
 
+#include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_ucd.h"
 #include "core/fxge/include/fx_ge.h"
 #include "xfa/fgas/crt/fgas_memory.h"
@@ -14,7 +15,6 @@
 #include "xfa/fgas/layout/fgas_textbreak.h"
 #include "xfa/fgas/layout/fgas_unicode.h"
 
-class IFX_Unknown;
 class IFX_Font;
 
 #define FX_RTFBREAKPOLICY_None 0x00
@@ -186,7 +186,7 @@ class CFX_RTFPiece : public CFX_Target {
   uint32_t m_dwLayoutStyles;
   uint32_t m_dwIdentity;
   CFX_RTFCharArray* m_pChars;
-  IFX_Unknown* m_pUserData;
+  IFX_Retainable* m_pUserData;
 };
 typedef CFX_BaseArrayTemplate<CFX_RTFPiece> CFX_RTFPieceArray;
 
@@ -220,7 +220,7 @@ class CFX_RTFLine {
   int32_t GetLineEnd() const { return m_iStart + m_iWidth; }
   void RemoveAll(FX_BOOL bLeaveMemory = FALSE) {
     CFX_RTFChar* pChar;
-    IFX_Unknown* pUnknown;
+    IFX_Retainable* pUnknown;
     int32_t iCount = m_LineChars.GetSize();
     for (int32_t i = 0; i < iCount; i++) {
       pChar = m_LineChars.GetDataPtr(i);
@@ -267,7 +267,7 @@ class CFX_RTFBreak {
   void SetWordSpace(FX_BOOL bDefault, FX_FLOAT fWordSpace);
   void SetReadingOrder(FX_BOOL bRTL = FALSE);
   void SetAlignment(int32_t iAlignment = FX_RTFLINEALIGNMENT_Left);
-  void SetUserData(IFX_Unknown* pUserData);
+  void SetUserData(IFX_Retainable* pUserData);
   uint32_t AppendChar(FX_WCHAR wch);
   uint32_t EndBreak(uint32_t dwStatus = FX_RTFBREAK_PieceBreak);
   int32_t CountBreakPieces() const;
@@ -318,7 +318,7 @@ class CFX_RTFBreak {
   int32_t m_iWordSpace;
   FX_BOOL m_bRTL;
   int32_t m_iAlignment;
-  IFX_Unknown* m_pUserData;
+  IFX_Retainable* m_pUserData;
   FX_CHARTYPE m_eCharType;
   uint32_t m_dwIdentity;
   CFX_RTFLine m_RTFLine1;
-- 
cgit v1.2.3