Merge to XFA: Kill CFX_Object.

xfa/src/fgas/include/fx_utl.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 _FX_UTILS
 #define _FX_UTILS
 class CFX_ThreadLock;
 class CFX_BaseArray;
@@ skipping 734 matching lines @@
     }
 protected:
     CPLTreeNode         *m_pParentNode;
     CPLTreeNode         *m_pChildNode;
     CPLTreeNode         *m_pPrevNode;
     CPLTreeNode         *m_pNextNode;
     baseType            m_Data;
     friend class CFX_CPLTree<baseType>;
 };
 template<class baseType>
-class CFX_CPLTree : public CFX_Object
+class CFX_CPLTree
 {
 public:
     typedef CFX_CPLTreeNode<baseType>   CPLTreeNode;
     CFX_CPLTree() : m_Root()
     {
     }
     ~CFX_CPLTree()
     {
         CPLTreeNode *pNode = m_Root.GetNode(CPLTreeNode::LastNeighbor);
         while (pNode != NULL) {
@@ skipping 23 matching lines @@
             CPLTreeNode *pLast = pParent->GetNode(CPLTreeNode::LastChild);
             pChild->SetPrevNode(pLast);
             pLast->SetNextNode(pChild);
         }
         return pChild;
     }
 protected:
     CPLTreeNode         m_Root;
 };
 #endif