From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: 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 --- fpdfsdk/include/javascript/JS_Object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/include/javascript') diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 74af9ba12d..02d2f57663 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h @@ -17,7 +17,7 @@ class CJS_Object; class CJS_Timer; class CJS_Context; -class CJS_EmbedObj : public CFX_Object +class CJS_EmbedObj { public: CJS_EmbedObj(CJS_Object* pJSObject); @@ -39,7 +39,7 @@ protected: CJS_Object* m_pJSObject; }; -class CJS_Object : public CFX_Object +class CJS_Object { public: CJS_Object(JSFXObject pObject); -- cgit v1.2.3