Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.

core/fxcrt/include/cfx_count_ref.h

 // Copyright 2016 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 CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
 #define CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_
 
 #include "core/fxcrt/include/cfx_retain_ptr.h"
 #include "core/fxcrt/include/fx_system.h"
 
 template <class ObjClass>
 class CFX_CountRef {
  public:
   CFX_CountRef() {}
   CFX_CountRef(const CFX_CountRef& other) : m_pObject(other.m_pObject) {}
   ~CFX_CountRef() {}
 
   template <typename... Args>
-  ObjClass* New(Args... params) {
+  ObjClass* Emplace(Args... params) {
     m_pObject.Reset(new CountedObj(params...));
     return m_pObject.Get();
   }
 
   CFX_CountRef& operator=(const CFX_CountRef& that) {
     if (*this != that)
       m_pObject = that.m_pObject;
     return *this;
   }
 
   void SetNull() { m_pObject.Reset(); }
   const ObjClass* GetObject() const { return m_pObject.Get(); }
 
   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();
   }
 
   bool operator==(const CFX_CountRef& that) const {
     return m_pObject == that.m_pObject;
   }
   bool operator!=(const CFX_CountRef& that) const { return !(*this == that); }
   operator bool() const { return m_pObject; }
@@ skipping 14 matching lines @@
     }
 
    private:
     intptr_t m_RefCount;
   };
 
   CFX_RetainPtr<CountedObj> m_pObject;
 };
 
 #endif  // CORE_FXCRT_INCLUDE_CFX_COUNT_REF_H_