From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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
---
 xfa/src/fxgraphics/src/fx_graphics.cpp           | 2 +-
 xfa/src/fxgraphics/src/fx_metafile_interpreter.h | 2 +-
 xfa/src/fxgraphics/src/fx_path_generator.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'xfa/src/fxgraphics')

diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp
index 340d46dfa9..56f6cee026 100644
--- a/xfa/src/fxgraphics/src/fx_graphics.cpp
+++ b/xfa/src/fxgraphics/src/fx_graphics.cpp
@@ -6,7 +6,7 @@
 
 #include "pre.h"
 #include "fx_path_generator.h"
-class CAGG_Graphics : public CFX_Object
+class CAGG_Graphics
 {
 public:
     CAGG_Graphics();
diff --git a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
index 6d827b6f30..64b63852ac 100644
--- a/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
+++ b/xfa/src/fxgraphics/src/fx_metafile_interpreter.h
@@ -6,7 +6,7 @@
 
 #ifndef __H_FX_METAFILE_INTERPRETER__
 #define __H_FX_METAFILE_INTERPRETER__
-class CFX_MetafileInterpreter : public CFX_Object
+class CFX_MetafileInterpreter
 {
 public:
     CFX_MetafileInterpreter();
diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/src/fx_path_generator.h
index c1447f6c3a..4ecc90ae35 100644
--- a/xfa/src/fxgraphics/src/fx_path_generator.h
+++ b/xfa/src/fxgraphics/src/fx_path_generator.h
@@ -6,7 +6,7 @@
 
 #ifndef __H_FX_PATH_GENERATOR__
 #define __H_FX_PATH_GENERATOR__
-class CFX_PathGenerator : public CFX_Object
+class CFX_PathGenerator
 {
 public:
     CFX_PathGenerator();
-- 
cgit v1.2.3