diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-17 13:54:10 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-17 13:54:10 -0800 |
| commit | bd6344d1138cf1f0e908ce4f8408c92a48c3b38a (patch) | |
| tree | a0a55ae18bb80ef84d6b259614ae71caa55cdb0b | |
| parent | 979ddd8e4d331b330360f321b7b0c1acaead6445 (diff) | |
| download | pdfium-bd6344d1138cf1f0e908ce4f8408c92a48c3b38a.tar.xz | |
Merge to XFA: FX_NAMESPACE_DECLARE pointless.
Orignal Review URL: https://codereview.chromium.org/1534003002 .
(cherry picked from commit fed9dd90c086c854ef13440e6022602eb9f91cfc)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1537463003 .
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 1 | ||||
| -rw-r--r-- | core/src/fxge/agg/include/fx_agg_driver.h | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index c5b8b38f3f..52d0f14771 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -1198,7 +1198,6 @@ typedef enum { Done } FX_ProgressiveStatus; #define ProgressiveStatus FX_ProgressiveStatus -#define FX_NAMESPACE_DECLARE(namespace, type) namespace ::type #ifdef PDF_ENABLE_XFA class IFX_Unknown { public: diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index 80febe1b4e..71569749fb 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(); } |