diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/src/fxjse | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'xfa/src/fxjse')
| -rw-r--r-- | xfa/src/fxjse/src/class.h | 2 | ||||
| -rw-r--r-- | xfa/src/fxjse/src/context.h | 2 | ||||
| -rw-r--r-- | xfa/src/fxjse/src/runtime.h | 4 | ||||
| -rw-r--r-- | xfa/src/fxjse/src/value.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h index 6a0f89fc72..26ebb91bfa 100644 --- a/xfa/src/fxjse/src/class.h +++ b/xfa/src/fxjse/src/class.h @@ -8,7 +8,7 @@ #define FXJSE_CLASS_H_
class CFXJSE_Context;
class CFXJSE_Value;
-class CFXJSE_Class : public CFX_Object
+class CFXJSE_Class
{
protected:
CFXJSE_Class(CFXJSE_Context* lpContext) : m_pContext(lpContext) {}
diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h index 6579cd973a..8d3300150f 100644 --- a/xfa/src/fxjse/src/context.h +++ b/xfa/src/fxjse/src/context.h @@ -8,7 +8,7 @@ #define FXJSE_CONTEXT_H_
class CFXJSE_Class;
class CFXJSE_Value;
-class CFXJSE_Context : public CFX_Object
+class CFXJSE_Context
{
protected:
CFXJSE_Context(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
diff --git a/xfa/src/fxjse/src/runtime.h b/xfa/src/fxjse/src/runtime.h index 78e891bfe4..87d540ec9b 100644 --- a/xfa/src/fxjse/src/runtime.h +++ b/xfa/src/fxjse/src/runtime.h @@ -7,7 +7,7 @@ #ifndef FXJSE_RUNTIME_H_
#define FXJSE_RUNTIME_H_
class CFXJSE_RuntimeList;
-class CFXJSE_RuntimeData : public CFX_Object
+class CFXJSE_RuntimeData
{
protected:
CFXJSE_RuntimeData(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {};
@@ -25,7 +25,7 @@ protected: CFXJSE_RuntimeData(const CFXJSE_RuntimeData&);
CFXJSE_RuntimeData& operator = (const CFXJSE_RuntimeData&);
};
-class CFXJSE_RuntimeList : public CFX_Object
+class CFXJSE_RuntimeList
{
public:
typedef void (*RuntimeDisposeCallback)(v8::Isolate*);
diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h index aca23bf310..eb118fd5c6 100644 --- a/xfa/src/fxjse/src/value.h +++ b/xfa/src/fxjse/src/value.h @@ -7,7 +7,7 @@ #ifndef FXJSE_VALUE_H_
#define FXJSE_VALUE_H_
#include "scope_inline.h"
-class CFXJSE_Value : public CFX_Object
+class CFXJSE_Value
{
public:
CFXJSE_Value(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {}
|