From 86224fc1f74a27c3448961c91e10d4e3feb427e4 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 16 Aug 2017 19:35:12 -0700 Subject: Remove default argument for CXFA_Graphics::SetLineWidth(). Change-Id: I6ea062bf5def0bc5fea7c52323198209dcf4c3e9 Reviewed-on: https://pdfium-review.googlesource.com/11110 Commit-Queue: dsinclair Reviewed-by: dsinclair --- xfa/fxfa/cxfa_fffield.cpp | 2 +- xfa/fxfa/cxfa_ffline.cpp | 3 ++- xfa/fxfa/cxfa_ffwidget.cpp | 3 ++- xfa/fxgraphics/cxfa_graphics.cpp | 11 +++++++---- xfa/fxgraphics/cxfa_graphics.h | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index c1c2c11d6f..1ef8824a3b 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -111,7 +111,7 @@ void CXFA_FFField::DrawFocus(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) { float DashPattern[2] = {1, 1}; pGS->SetLineDash(0.0f, DashPattern, 2); - pGS->SetLineWidth(0, false); + pGS->SetLineWidth(0); CXFA_Path path; path.AddRectangle(m_rtUI.left, m_rtUI.top, m_rtUI.width, m_rtUI.height); diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp index 130ce9b28b..4353e684a4 100644 --- a/xfa/fxfa/cxfa_ffline.cpp +++ b/xfa/fxfa/cxfa_ffline.cpp @@ -89,7 +89,8 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS, linePath.AddLine(rtLine.TopLeft(), rtLine.BottomRight()); pGS->SaveGraphState(); - pGS->SetLineWidth(fLineWidth, true); + pGS->SetLineWidth(fLineWidth); + pGS->EnableActOnDash(); XFA_StrokeTypeSetLineDash(pGS, iStrokeType, iCap); pGS->SetStrokeColor(CXFA_Color(lineColor)); pGS->SetLineCap(XFA_LineCapToFXGE(iCap)); diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index c0eb0a3a0d..ee5a55e122 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -1676,7 +1676,8 @@ static void XFA_BOX_StrokePath(CXFA_Stroke stroke, if (stroke.IsCorner() && fThickness > 2 * stroke.GetRadius()) { fThickness = 2 * stroke.GetRadius(); } - pGS->SetLineWidth(fThickness, true); + pGS->SetLineWidth(fThickness); + pGS->EnableActOnDash(); pGS->SetLineCap(CFX_GraphStateData::LineCapButt); XFA_StrokeTypeSetLineDash(pGS, stroke.GetStrokeType(), XFA_ATTRIBUTEENUM_Butt); diff --git a/xfa/fxgraphics/cxfa_graphics.cpp b/xfa/fxgraphics/cxfa_graphics.cpp index 981c288b46..4975a83251 100644 --- a/xfa/fxgraphics/cxfa_graphics.cpp +++ b/xfa/fxgraphics/cxfa_graphics.cpp @@ -158,11 +158,14 @@ void CXFA_Graphics::SetLineDash(FX_DashStyle dashStyle) { RenderDeviceSetLineDash(dashStyle); } -void CXFA_Graphics::SetLineWidth(float lineWidth, bool isActOnDash) { - if (m_type == FX_CONTEXT_Device && m_renderDevice) { +void CXFA_Graphics::SetLineWidth(float lineWidth) { + if (m_type == FX_CONTEXT_Device && m_renderDevice) m_info.graphState.m_LineWidth = lineWidth; - m_info.isActOnDash = isActOnDash; - } +} + +void CXFA_Graphics::EnableActOnDash() { + if (m_type == FX_CONTEXT_Device && m_renderDevice) + m_info.isActOnDash = true; } void CXFA_Graphics::SetStrokeColor(const CXFA_Color& color) { diff --git a/xfa/fxgraphics/cxfa_graphics.h b/xfa/fxgraphics/cxfa_graphics.h index 8069c8ecbd..05f9640ca8 100644 --- a/xfa/fxgraphics/cxfa_graphics.h +++ b/xfa/fxgraphics/cxfa_graphics.h @@ -56,7 +56,8 @@ class CXFA_Graphics { void SetLineCap(CFX_GraphStateData::LineCap lineCap); void SetLineDash(float dashPhase, float* dashArray, int32_t dashCount); void SetLineDash(FX_DashStyle dashStyle); - void SetLineWidth(float lineWidth, bool isActOnDash = false); + void SetLineWidth(float lineWidth); + void EnableActOnDash(); void SetStrokeColor(const CXFA_Color& color); void SetFillColor(const CXFA_Color& color); void SetClipRect(const CFX_RectF& rect); -- cgit v1.2.3