From 9fed656915010adf6003017bc2e3c353668f9dc5 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 20:31:10 +0000 Subject: Rename CXFA_Line to CXFA_LineData This CL renames CXFA_Line to CXFA_LineData to make it clear the code is part of the data hierarchy. Change-Id: I8056a4afeea1340ee53dab697b6ea83c0e7b2eb4 Reviewed-on: https://pdfium-review.googlesource.com/17985 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- BUILD.gn | 4 ++-- xfa/fxfa/cxfa_ffline.cpp | 8 ++++---- xfa/fxfa/parser/cxfa_line.cpp | 22 ---------------------- xfa/fxfa/parser/cxfa_line.h | 25 ------------------------- xfa/fxfa/parser/cxfa_linedata.cpp | 22 ++++++++++++++++++++++ xfa/fxfa/parser/cxfa_linedata.h | 25 +++++++++++++++++++++++++ xfa/fxfa/parser/cxfa_value.cpp | 6 +++--- xfa/fxfa/parser/cxfa_value.h | 4 ++-- 8 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 xfa/fxfa/parser/cxfa_line.cpp delete mode 100644 xfa/fxfa/parser/cxfa_line.h create mode 100644 xfa/fxfa/parser/cxfa_linedata.cpp create mode 100644 xfa/fxfa/parser/cxfa_linedata.h diff --git a/BUILD.gn b/BUILD.gn index 1d49d7f211..56f7bc0ee1 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1838,8 +1838,8 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/cxfa_layoutpagemgr.h", "xfa/fxfa/parser/cxfa_layoutprocessor.cpp", "xfa/fxfa/parser/cxfa_layoutprocessor.h", - "xfa/fxfa/parser/cxfa_line.cpp", - "xfa/fxfa/parser/cxfa_line.h", + "xfa/fxfa/parser/cxfa_linedata.cpp", + "xfa/fxfa/parser/cxfa_linedata.h", "xfa/fxfa/parser/cxfa_localemgr.cpp", "xfa/fxfa/parser/cxfa_localemgr.h", "xfa/fxfa/parser/cxfa_localevalue.cpp", diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp index cc52ce1763..a5e9441061 100644 --- a/xfa/fxfa/cxfa_ffline.cpp +++ b/xfa/fxfa/cxfa_ffline.cpp @@ -57,12 +57,12 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS, if (!value) return; - CXFA_Line lineObj = value.GetLine(); + CXFA_LineData lineData = value.GetLineData(); FX_ARGB lineColor = 0xFF000000; int32_t iStrokeType = 0; float fLineWidth = 1.0f; int32_t iCap = 0; - CXFA_EdgeData edgeData = lineObj.GetEdgeData(); + CXFA_EdgeData edgeData = lineData.GetEdgeData(); if (edgeData) { if (edgeData.GetPresence() != XFA_ATTRIBUTEENUM_Visible) return; @@ -80,9 +80,9 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS, if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) XFA_RectWidthoutMargin(rtLine, mgWidget); - GetRectFromHand(rtLine, lineObj.GetHand(), fLineWidth); + GetRectFromHand(rtLine, lineData.GetHand(), fLineWidth); CXFA_Path linePath; - if (lineObj.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f) + if (lineData.GetSlope() && rtLine.right() > 0.0f && rtLine.bottom() > 0.0f) linePath.AddLine(rtLine.TopRight(), rtLine.BottomLeft()); else linePath.AddLine(rtLine.TopLeft(), rtLine.BottomRight()); diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_line.cpp deleted file mode 100644 index 5216bd4622..0000000000 --- a/xfa/fxfa/parser/cxfa_line.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa/fxfa/parser/cxfa_line.h" - -#include "xfa/fxfa/parser/cxfa_node.h" - -int32_t CXFA_Line::GetHand() { - return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Hand); -} - -bool CXFA_Line::GetSlope() { - return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Slope) == - XFA_ATTRIBUTEENUM_Slash; -} - -CXFA_EdgeData CXFA_Line::GetEdgeData() { - return CXFA_EdgeData(m_pNode->GetChild(0, XFA_Element::Edge, false)); -} diff --git a/xfa/fxfa/parser/cxfa_line.h b/xfa/fxfa/parser/cxfa_line.h deleted file mode 100644 index b167e39810..0000000000 --- a/xfa/fxfa/parser/cxfa_line.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FXFA_PARSER_CXFA_LINE_H_ -#define XFA_FXFA_PARSER_CXFA_LINE_H_ - -#include "core/fxcrt/fx_system.h" -#include "xfa/fxfa/parser/cxfa_data.h" -#include "xfa/fxfa/parser/cxfa_edgedata.h" - -class CXFA_Node; - -class CXFA_Line : public CXFA_Data { - public: - explicit CXFA_Line(CXFA_Node* pNode) : CXFA_Data(pNode) {} - - int32_t GetHand(); - bool GetSlope(); - CXFA_EdgeData GetEdgeData(); -}; - -#endif // XFA_FXFA_PARSER_CXFA_LINE_H_ diff --git a/xfa/fxfa/parser/cxfa_linedata.cpp b/xfa/fxfa/parser/cxfa_linedata.cpp new file mode 100644 index 0000000000..a6f4e4c6cf --- /dev/null +++ b/xfa/fxfa/parser/cxfa_linedata.cpp @@ -0,0 +1,22 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#include "xfa/fxfa/parser/cxfa_linedata.h" + +#include "xfa/fxfa/parser/cxfa_node.h" + +int32_t CXFA_LineData::GetHand() { + return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Hand); +} + +bool CXFA_LineData::GetSlope() { + return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_Slope) == + XFA_ATTRIBUTEENUM_Slash; +} + +CXFA_EdgeData CXFA_LineData::GetEdgeData() { + return CXFA_EdgeData(m_pNode->GetChild(0, XFA_Element::Edge, false)); +} diff --git a/xfa/fxfa/parser/cxfa_linedata.h b/xfa/fxfa/parser/cxfa_linedata.h new file mode 100644 index 0000000000..596bef76f0 --- /dev/null +++ b/xfa/fxfa/parser/cxfa_linedata.h @@ -0,0 +1,25 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef XFA_FXFA_PARSER_CXFA_LINEDATA_H_ +#define XFA_FXFA_PARSER_CXFA_LINEDATA_H_ + +#include "core/fxcrt/fx_system.h" +#include "xfa/fxfa/parser/cxfa_data.h" +#include "xfa/fxfa/parser/cxfa_edgedata.h" + +class CXFA_Node; + +class CXFA_LineData : public CXFA_Data { + public: + explicit CXFA_LineData(CXFA_Node* pNode) : CXFA_Data(pNode) {} + + int32_t GetHand(); + bool GetSlope(); + CXFA_EdgeData GetEdgeData(); +}; + +#endif // XFA_FXFA_PARSER_CXFA_LINEDATA_H_ diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index 5b812a9f7f..bad1681031 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -29,9 +29,9 @@ CXFA_ArcData CXFA_Value::GetArcData() { : nullptr); } -CXFA_Line CXFA_Value::GetLine() { - return CXFA_Line(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) - : nullptr); +CXFA_LineData CXFA_Value::GetLineData() { + return CXFA_LineData(m_pNode ? m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild) + : nullptr); } CXFA_Rectangle CXFA_Value::GetRectangle() { diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h index 65a9c36b00..d13d90fe8a 100644 --- a/xfa/fxfa/parser/cxfa_value.h +++ b/xfa/fxfa/parser/cxfa_value.h @@ -12,7 +12,7 @@ #include "xfa/fxfa/parser/cxfa_data.h" #include "xfa/fxfa/parser/cxfa_exdata.h" #include "xfa/fxfa/parser/cxfa_imagedata.h" -#include "xfa/fxfa/parser/cxfa_line.h" +#include "xfa/fxfa/parser/cxfa_linedata.h" #include "xfa/fxfa/parser/cxfa_rectangle.h" #include "xfa/fxfa/parser/cxfa_text.h" @@ -25,7 +25,7 @@ class CXFA_Value : public CXFA_Data { XFA_Element GetChildValueClassID(); bool GetChildValueContent(WideString& wsContent); CXFA_ArcData GetArcData(); - CXFA_Line GetLine(); + CXFA_LineData GetLineData(); CXFA_Rectangle GetRectangle(); CXFA_Text GetText(); CXFA_ExData GetExData(); -- cgit v1.2.3