From b415ffb47de6e58603db2a01027aa879c0126b24 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 20:06:01 +0000 Subject: Rename CXFA_Edge to CXFA_EdgeData This CL renames CXFA_Edge to CXFA_EdgeData to make it clear it's part of the data hierarchy. Change-Id: Id67526cafe1927803c36159b106656c32e770d6b Reviewed-on: https://pdfium-review.googlesource.com/17979 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- fxjs/cjx_node.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'fxjs') diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index 224d295755..c82a9f4912 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -1536,13 +1536,11 @@ void CJX_Node::Script_Som_BorderColor(CFXJSE_Value* pValue, int32_t b = 0; StrToRGB(pValue->ToWideString(), r, g, b); FX_ARGB rgb = ArgbEncode(100, r, g, b); - for (int32_t i = 0; i < iSize; ++i) { - CXFA_Edge edge = borderData.GetEdge(i); - edge.SetColor(rgb); - } + for (int32_t i = 0; i < iSize; ++i) + borderData.GetEdgeData(i).SetColor(rgb); + } else { - CXFA_Edge edge = borderData.GetEdge(0); - FX_ARGB color = edge.GetColor(); + FX_ARGB color = borderData.GetEdgeData(0).GetColor(); int32_t a; int32_t r; int32_t g; @@ -1567,14 +1565,13 @@ void CJX_Node::Script_Som_BorderWidth(CFXJSE_Value* pValue, if (bSetting) { wsThickness = pValue->ToWideString(); for (int32_t i = 0; i < iSize; ++i) { - CXFA_Edge edge = borderData.GetEdge(i); - CXFA_Measurement thickness(wsThickness.AsStringView()); - edge.SetMSThickness(thickness); + borderData.GetEdgeData(i).SetMSThickness( + CXFA_Measurement(wsThickness.AsStringView())); } } else { - CXFA_Edge edge = borderData.GetEdge(0); - CXFA_Measurement thickness = edge.GetMSThickness(); + CXFA_Measurement thickness = borderData.GetEdgeData(0).GetMSThickness(); thickness.ToString(&wsThickness); + pValue->SetString(wsThickness.UTF8Encode().AsStringView()); } } -- cgit v1.2.3