Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/fm2js/xfa_fmparse.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_FM_PARSE_H
 #define _XFA_FM_PARSE_H
-class CXFA_FMParse : public CFX_Object
+class CXFA_FMParse
 {
 public:
     CXFA_FMParse();
     ~CXFA_FMParse();
     FX_INT32 Init(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo);
     void NextToken();
     void Check(XFA_FM_TOKEN op);
     void Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...);
     CFX_PtrArray * ParseTopExpression();
     CXFA_FMExpression *ParseFunction();
@@ skipping 20 matching lines @@
     CXFA_FMSimpleExpression *ParsePostExpression(CXFA_FMSimpleExpression *e);
     CXFA_FMSimpleExpression *ParseIndexExpression();
 private:
     FX_LPCWSTR m_pScript;
     FX_STRSIZE m_uLength;
     CXFA_FMLexer        *m_lexer;
     CXFA_FMToken        *m_pToken;
     CXFA_FMErrorInfo *m_pErrorInfo;
 };
 #endif