Move fx_agg_driver files up one level

core/src/fxge/agg/fx_agg_driver.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 CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_
-#define CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_
+#ifndef CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_
+#define CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_
 
 #include "core/include/fxge/fx_ge.h"
 #include "third_party/agg23/agg_clip_liang_barsky.h"
 #include "third_party/agg23/agg_path_storage.h"
 #include "third_party/agg23/agg_rasterizer_scanline_aa.h"
 
 class CFX_Matrix;
 class CFX_PathData;
 
 class CAgg_PathData {
  public:
   CAgg_PathData() {}
   ~CAgg_PathData() {}
   void BuildPath(const CFX_PathData* pPathData,
                  const CFX_Matrix* pObject2Device);
 
   agg::path_storage m_PathData;
 };
+
 class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
  public:
   CFX_AggDeviceDriver(CFX_DIBitmap* pBitmap,
                       int dither_bits,
                       FX_BOOL bRgbByteOrder,
                       CFX_DIBitmap* pOriDevice,
                       FX_BOOL bGroupKnockout);
   ~CFX_AggDeviceDriver() override;
 
   void InitPlatform();
@@ skipping 88 matching lines @@
 
   FX_BOOL RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
                            FX_DWORD color,
                            FX_BOOL bFullCover,
                            FX_BOOL bGroupKnockout,
                            int alpha_flag,
                            void* pIccTransform);
 
   void SetClipMask(agg::rasterizer_scanline_aa& rasterizer);
 
-  virtual uint8_t* GetBuffer() const { return m_pBitmap->GetBuffer(); }
+  virtual uint8_t* GetBuffer() const;
 
+ private:
   CFX_DIBitmap* m_pBitmap;
   CFX_ClipRgn* m_pClipRgn;
   CFX_ArrayTemplate<CFX_ClipRgn*> m_StateStack;
   void* m_pPlatformGraphics;
   void* m_pPlatformBitmap;
   void* m_pDwRenderTartget;
   int m_FillFlags;
   int m_DitherBits;
   FX_BOOL m_bRgbByteOrder;
   CFX_DIBitmap* m_pOriDevice;
   FX_BOOL m_bGroupKnockout;
 };
 
-#endif  // CORE_SRC_FXGE_AGG_INCLUDE_FX_AGG_DRIVER_H_
+#endif  // CORE_SRC_FXGE_AGG_FX_AGG_DRIVER_H_