Remove IFDE_Pen and IFDE_Brush.

xfa/fde/fde_visualset.h

 // 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
 
 #ifndef XFA_FDE_FDE_VISUALSET_H_
 #define XFA_FDE_FDE_VISUALSET_H_
 
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_ge.h"
-#include "xfa/fde/fde_brush.h"
 #include "xfa/fde/fde_image.h"
+#include "xfa/fde/fde_object.h"
 #include "xfa/fde/fde_path.h"
-#include "xfa/fde/fde_pen.h"
 #include "xfa/fgas/font/fgas_font.h"
 
 enum FDE_VISUALOBJTYPE {
   FDE_VISUALOBJ_Canvas = 0x00,
   FDE_VISUALOBJ_Text = 0x01,
   FDE_VISUALOBJ_Image = 0x02,
   FDE_VISUALOBJ_Path = 0x04,
   FDE_VISUALOBJ_Widget = 0x08,
 };
 
@@ skipping 43 matching lines @@
   virtual FX_POSITION GetFirstFilterPosition(FDE_HVISUALOBJ hImage) = 0;
   virtual const FDE_IMAGEFILTERPARAMS* GetNextFilter(FDE_HVISUALOBJ hImage,
                                                      FX_POSITION& pos) = 0;
 };
 
 class IFDE_PathSet : public IFDE_VisualSet {
  public:
   virtual IFDE_Path* GetPath(FDE_HVISUALOBJ hPath) = 0;
   virtual int32_t GetFillMode(FDE_HVISUALOBJ hPath) = 0;
   virtual int32_t GetRenderMode(FDE_HVISUALOBJ hPath) = 0;
-  virtual IFDE_Pen* GetPen(FDE_HVISUALOBJ hPath) = 0;
+  virtual CFDE_Pen* GetPen(FDE_HVISUALOBJ hPath) = 0;
   virtual FX_FLOAT GetPenWidth(FDE_HVISUALOBJ hPath) = 0;
-  virtual IFDE_Brush* GetBrush(FDE_HVISUALOBJ hPath) = 0;
+  virtual CFDE_Brush* GetBrush(FDE_HVISUALOBJ hPath) = 0;
 };
 
 enum FDE_WIDGETOBJ {
   FDE_WIDGETOBJ_Unknown = 0x0000,
   FDE_WIDGETOBJ_Anchor = 0x0100,
   FDE_WIDGETOBJ_NamedDest = 0x0200,
   FDE_WIDGETOBJ_HyperLink = 0x0400,
 };
 
 class IFDE_WidgetSet : public IFDE_VisualSet {
@@ skipping 20 matching lines @@
   virtual void Release() = 0;
   virtual FX_BOOL AttachCanvas(IFDE_CanvasSet* pCanvas) = 0;
   virtual FX_BOOL FilterObjects(uint32_t dwObjects = 0xFFFFFFFF) = 0;
   virtual void Reset() = 0;
   virtual FDE_HVISUALOBJ GetNext(IFDE_VisualSet*& pVisualSet,
                                  FDE_HVISUALOBJ* phCanvasObj = NULL,
                                  IFDE_CanvasSet** ppCanvasSet = NULL) = 0;
 };
 
 #endif  // XFA_FDE_FDE_VISUALSET_H_