From 129297f6ae97169093d4affe3c8421b757bd95ec Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 Aug 2017 12:01:03 -0700 Subject: Remove default parameters in CXFA_Graphics methods. Constify parameters as well. Change-Id: I7e87b11cc73b133b04d49ceed1c46f5afcb89d1a Reviewed-on: https://pdfium-review.googlesource.com/11111 Commit-Queue: Lei Zhang Reviewed-by: dsinclair --- xfa/fxgraphics/cxfa_graphics.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'xfa/fxgraphics/cxfa_graphics.h') diff --git a/xfa/fxgraphics/cxfa_graphics.h b/xfa/fxgraphics/cxfa_graphics.h index 05f9640ca8..99f86870c3 100644 --- a/xfa/fxgraphics/cxfa_graphics.h +++ b/xfa/fxgraphics/cxfa_graphics.h @@ -50,7 +50,7 @@ class CXFA_Graphics { void RestoreGraphState(); CFX_RectF GetClipRect() const; - CFX_Matrix* GetMatrix(); + const CFX_Matrix* GetMatrix() const; CFX_RenderDevice* GetRenderDevice(); void SetLineCap(CFX_GraphStateData::LineCap lineCap); @@ -61,13 +61,13 @@ class CXFA_Graphics { void SetStrokeColor(const CXFA_Color& color); void SetFillColor(const CXFA_Color& color); void SetClipRect(const CFX_RectF& rect); - void StrokePath(CXFA_Path* path, CFX_Matrix* matrix = nullptr); + void StrokePath(CXFA_Path* path, const CFX_Matrix* matrix); void FillPath(CXFA_Path* path, - FX_FillMode fillMode = FXFILL_WINDING, - CFX_Matrix* matrix = nullptr); + FX_FillMode fillMode, + const CFX_Matrix* matrix); void StretchImage(const CFX_RetainPtr& source, const CFX_RectF& rect, - CFX_Matrix* matrix = nullptr); + const CFX_Matrix& matrix); void ConcatMatrix(const CFX_Matrix* matrix); protected: @@ -87,23 +87,23 @@ class CXFA_Graphics { } m_info; void RenderDeviceSetLineDash(FX_DashStyle dashStyle); - void RenderDeviceStrokePath(CXFA_Path* path, CFX_Matrix* matrix); - void RenderDeviceFillPath(CXFA_Path* path, + void RenderDeviceStrokePath(const CXFA_Path* path, const CFX_Matrix* matrix); + void RenderDeviceFillPath(const CXFA_Path* path, FX_FillMode fillMode, - CFX_Matrix* matrix); + const CFX_Matrix* matrix); void RenderDeviceStretchImage(const CFX_RetainPtr& source, const CFX_RectF& rect, - CFX_Matrix* matrix); + const CFX_Matrix& matrix); - void FillPathWithPattern(CXFA_Path* path, + void FillPathWithPattern(const CXFA_Path* path, FX_FillMode fillMode, - CFX_Matrix* matrix); - void FillPathWithShading(CXFA_Path* path, + const CFX_Matrix& matrix); + void FillPathWithShading(const CXFA_Path* path, FX_FillMode fillMode, - CFX_Matrix* matrix); + const CFX_Matrix& matrix); void SetDIBitsWithMatrix(const CFX_RetainPtr& source, - CFX_Matrix* matrix); + const CFX_Matrix& matrix); CFX_RenderDevice* const m_renderDevice; // Not owned. std::vector> m_infoStack; -- cgit v1.2.3