summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-07 18:40:35 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 18:40:35 +0000
commit50132e522702dd016b83ed12e91d065357fe0b59 (patch)
treec766cd59b00885c8dd38b1e0ff2ba9e9ebde5c85 /xfa/fxfa/parser
parente0d68541163e34cc61fcb7e7cb9f5a9887f45245 (diff)
downloadpdfium-50132e522702dd016b83ed12e91d065357fe0b59.tar.xz
Rename CXFA_Border to CXFA_BorderData
This CL renames CXFA_Border to CXFA_BorderData to make it clear it's part of the Data hierarchy. Change-Id: Icfe8dc07d527ba54413f073f5a444fb7b2a71271 Reviewed-on: https://pdfium-review.googlesource.com/17974 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/cxfa_borderdata.h (renamed from xfa/fxfa/parser/cxfa_border.h)10
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp18
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.h6
3 files changed, 17 insertions, 17 deletions
diff --git a/xfa/fxfa/parser/cxfa_border.h b/xfa/fxfa/parser/cxfa_borderdata.h
index 27b469cd2f..20e66562e5 100644
--- a/xfa/fxfa/parser/cxfa_border.h
+++ b/xfa/fxfa/parser/cxfa_borderdata.h
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_PARSER_CXFA_BORDER_H_
-#define XFA_FXFA_PARSER_CXFA_BORDER_H_
+#ifndef XFA_FXFA_PARSER_CXFA_BORDERDATA_H_
+#define XFA_FXFA_PARSER_CXFA_BORDERDATA_H_
#include "xfa/fxfa/parser/cxfa_box.h"
class CXFA_Node;
-class CXFA_Border : public CXFA_Box {
+class CXFA_BorderData : public CXFA_Box {
public:
- explicit CXFA_Border(CXFA_Node* pNode) : CXFA_Box(pNode) {}
+ explicit CXFA_BorderData(CXFA_Node* pNode) : CXFA_Box(pNode) {}
};
-#endif // XFA_FXFA_PARSER_CXFA_BORDER_H_
+#endif // XFA_FXFA_PARSER_CXFA_BORDERDATA_H_
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 75de937944..ae857cb9c5 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -279,8 +279,8 @@ int32_t CXFA_WidgetData::GetRotate() {
return iRotate / 90 * 90;
}
-CXFA_Border CXFA_WidgetData::GetBorder(bool bModified) {
- return CXFA_Border(
+CXFA_BorderData CXFA_WidgetData::GetBorderData(bool bModified) {
+ return CXFA_BorderData(
m_pNode->JSNode()->GetProperty(0, XFA_Element::Border, bModified));
}
@@ -387,9 +387,9 @@ bool CXFA_WidgetData::GetMaxHeight(float& fMaxHeight) {
return TryMeasure(XFA_ATTRIBUTE_MaxH, fMaxHeight);
}
-CXFA_Border CXFA_WidgetData::GetUIBorder() {
+CXFA_BorderData CXFA_WidgetData::GetUIBorderData() {
CXFA_Node* pUIChild = GetUIChild();
- return CXFA_Border(
+ return CXFA_BorderData(
pUIChild ? pUIChild->JSNode()->GetProperty(0, XFA_Element::Border, false)
: nullptr);
}
@@ -403,8 +403,8 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() {
if (!mgUI)
return CFX_RectF();
- CXFA_Border border = GetUIBorder();
- if (border && border.GetPresence() != XFA_ATTRIBUTEENUM_Visible)
+ CXFA_BorderData borderData = GetUIBorderData();
+ if (borderData && borderData.GetPresence() != XFA_ATTRIBUTEENUM_Visible)
return CFX_RectF();
float fLeftInset, fTopInset, fRightInset, fBottomInset;
@@ -412,13 +412,13 @@ CFX_RectF CXFA_WidgetData::GetUIMargin() {
bool bTop = mgUI.GetTopInset(fTopInset);
bool bRight = mgUI.GetRightInset(fRightInset);
bool bBottom = mgUI.GetBottomInset(fBottomInset);
- if (border) {
+ if (borderData) {
bool bVisible = false;
float fThickness = 0;
- border.Get3DStyle(bVisible, fThickness);
+ borderData.Get3DStyle(bVisible, fThickness);
if (!bLeft || !bTop || !bRight || !bBottom) {
std::vector<CXFA_Stroke> strokes;
- border.GetStrokes(&strokes);
+ borderData.GetStrokes(&strokes);
if (!bTop)
fTopInset = GetEdgeThickness(strokes, bVisible, 0);
if (!bRight)
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h
index deeb51d9ce..f741a33858 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.h
+++ b/xfa/fxfa/parser/cxfa_widgetdata.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/fx_system.h"
#include "xfa/fxfa/parser/cxfa_assistdata.h"
#include "xfa/fxfa/parser/cxfa_binddata.h"
-#include "xfa/fxfa/parser/cxfa_border.h"
+#include "xfa/fxfa/parser/cxfa_borderdata.h"
#include "xfa/fxfa/parser/cxfa_calculate.h"
#include "xfa/fxfa/parser/cxfa_caption.h"
#include "xfa/fxfa/parser/cxfa_data.h"
@@ -50,7 +50,7 @@ class CXFA_WidgetData : public CXFA_Data {
int32_t GetRotate();
CXFA_AssistData GetAssistData();
- CXFA_Border GetBorder(bool bModified);
+ CXFA_BorderData GetBorderData(bool bModified);
CXFA_Caption GetCaption();
CXFA_Font GetFont(bool bModified);
CXFA_Margin GetMargin();
@@ -70,7 +70,7 @@ class CXFA_WidgetData : public CXFA_Data {
bool GetMaxWidth(float& fMaxWidth);
bool GetMaxHeight(float& fMaxHeight);
- CXFA_Border GetUIBorder();
+ CXFA_BorderData GetUIBorderData();
CFX_RectF GetUIMargin();
int32_t GetButtonHighlight();
bool GetButtonRollover(WideString& wsRollover, bool& bRichText);