Merge to XFA: Kill CFX_Object.

core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp

 // 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
 
 #include <limits.h>
 
 #include "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../src/fxcrt/fx_safe_types.h"
 #include "../../../third_party/base/numerics/safe_conversions_impl.h"
 #include "pageint.h"
 
 class CPDF_PSEngine;
 typedef enum {PSOP_ADD, PSOP_SUB, PSOP_MUL, PSOP_DIV, PSOP_IDIV, PSOP_MOD,
               PSOP_NEG, PSOP_ABS, PSOP_CEILING, PSOP_FLOOR, PSOP_ROUND, PSOP_TRUNCATE,
               PSOP_SQRT, PSOP_SIN, PSOP_COS, PSOP_ATAN, PSOP_EXP, PSOP_LN, PSOP_LOG,
               PSOP_CVI, PSOP_CVR, PSOP_EQ, PSOP_NE, PSOP_GT, PSOP_GE, PSOP_LT, PSOP_LE,
               PSOP_AND, PSOP_OR, PSOP_XOR, PSOP_NOT, PSOP_BITSHIFT, PSOP_TRUE, PSOP_FALSE,
               PSOP_IF, PSOP_IFELSE, PSOP_POP, PSOP_EXCH, PSOP_DUP, PSOP_COPY,
               PSOP_INDEX, PSOP_ROLL, PSOP_PROC, PSOP_CONST
              } PDF_PSOP;
-class CPDF_PSProc : public CFX_Object
+class CPDF_PSProc 
 {
 public:
     ~CPDF_PSProc();
     FX_BOOL     Parse(CPDF_SimpleParser& parser);
     FX_BOOL     Execute(CPDF_PSEngine* pEngine);
     CFX_PtrArray                m_Operators;
 };
 #define PSENGINE_STACKSIZE 100
-class CPDF_PSEngine : public CFX_Object
+class CPDF_PSEngine 
 {
 public:
     CPDF_PSEngine();
     ~CPDF_PSEngine();
     FX_BOOL     Parse(const FX_CHAR* string, int size);
     FX_BOOL     Execute()
     {
         return m_MainProc.Execute(this);
     }
     FX_BOOL     DoOperator(PDF_PSOP op);
@@ skipping 854 matching lines @@
         for (int i = 0; i < m_nOutputs; i ++) {
             if (results[i] < m_pRanges[i * 2]) {
                 results[i] = m_pRanges[i * 2];
             } else if (results[i] > m_pRanges[i * 2 + 1]) {
                 results[i] = m_pRanges[i * 2 + 1];
             }
         }
     }
     return TRUE;
 }