Merge to XFA: FX_NAMESPACE_DECLARE pointless.

core/src/fxge/agg/include/fx_agg_driver.h

Index: core/src/fxge/agg/include/fx_agg_driver.h
diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h
index 80febe1b4efcf7dd420677b1ab243ac7761e67a4..71569749fb991b73cf01bff1331e360061ad9262 100644
--- a/core/src/fxge/agg/include/fx_agg_driver.h
+++ b/core/src/fxge/agg/include/fx_agg_driver.h
@@ -19,9 +19,10 @@ class CAgg_PathData {
  public:
   CAgg_PathData() {}
   ~CAgg_PathData() {}
-  FX_NAMESPACE_DECLARE(agg, path_storage) m_PathData;
   void BuildPath(const CFX_PathData* pPathData,
                  const CFX_Matrix* pObject2Device);
+
+  agg::path_storage m_PathData;
 };
 class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
  public:
@@ -122,16 +123,14 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
                          void* pIccTransform) override;
   int GetDriverType() override { return 1; }
 
-  FX_BOOL RenderRasterizer(FX_NAMESPACE_DECLARE(agg, rasterizer_scanline_aa) &
-                               rasterizer,
+  FX_BOOL RenderRasterizer(agg::rasterizer_scanline_aa& rasterizer,
                            FX_DWORD color,
                            FX_BOOL bFullCover,
                            FX_BOOL bGroupKnockout,
                            int alpha_flag,
                            void* pIccTransform);
 
-  void SetClipMask(FX_NAMESPACE_DECLARE(agg, rasterizer_scanline_aa) &
-                   rasterizer);
+  void SetClipMask(agg::rasterizer_scanline_aa& rasterizer);
 
   virtual uint8_t* GetBuffer() const { return m_pBitmap->GetBuffer(); }