| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 | [log] [tgz] |
|---|---|---|
| author | Tom Sepez <tsepez@chromium.org> | Tue Apr 14 13:50:34 2015 -0700 |
| committer | Tom Sepez <tsepez@chromium.org> | Tue Apr 14 13:50:34 2015 -0700 |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c [diff] [blame] |
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
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h index 74af9ba..02d2f57 100644 --- a/fpdfsdk/include/javascript/JS_Object.h +++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -17,7 +17,7 @@ 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 @@ CJS_Object* m_pJSObject; }; -class CJS_Object : public CFX_Object +class CJS_Object { public: CJS_Object(JSFXObject pObject);