Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.

core/fxcrt/include/cfx_count_ref.h

Index: core/fxcrt/include/cfx_count_ref.h
diff --git a/core/fxcrt/include/cfx_count_ref.h b/core/fxcrt/include/cfx_count_ref.h
index 954b72bf8820743ffc2b79e0e7f93a70d816c9c6..aac18b166a8254a7f1ab4c45a291c3116d0aa47b 100644
--- a/core/fxcrt/include/cfx_count_ref.h
+++ b/core/fxcrt/include/cfx_count_ref.h
@@ -18,7 +18,7 @@ class CFX_CountRef {
   ~CFX_CountRef() {}
 
   template <typename... Args>
-  ObjClass* New(Args... params) {
+  ObjClass* Emplace(Args... params) {
     m_pObject.Reset(new CountedObj(params...));
     return m_pObject.Get();
   }
@@ -35,7 +35,7 @@ class CFX_CountRef {
   template <typename... Args>
   ObjClass* GetPrivateCopy(Args... params) {
     if (!m_pObject)
-      return New(params...);
+      return Emplace(params...);
     if (!m_pObject->HasOneRef())
       m_pObject.Reset(new CountedObj(*m_pObject));
     return m_pObject.Get();