Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: core/src/fxge/agg/include/fx_agg_driver.h

Issue 1537463003: Merge to XFA: FX_NAMESPACE_DECLARE pointless. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/include/fxcrt/fx_basic.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(); }
« no previous file with comments | « core/include/fxcrt/fx_basic.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698