summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-16 15:46:35 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-16 15:46:35 +0000
commit54e4ccbbf09c496f8ab79a2b02fc4afc3d6abc42 (patch)
tree4ad1768673054ccacf524e632dfae40fab87a609 /xfa
parentd3ae179dab3f63625e5dd3ddf0aa33176f8ee65c (diff)
downloadpdfium-54e4ccbbf09c496f8ab79a2b02fc4afc3d6abc42.tar.xz
Rename CXFA_Line methods to make clearer
This CL clarifies that he CXFA_Line::GetEdge method can return nullptr. Change-Id: I785d4636126727e07a80afb001489bd00ec9ae9e Reviewed-on: https://pdfium-review.googlesource.com/22771 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fxfa/cxfa_ffline.cpp8
-rw-r--r--xfa/fxfa/parser/cxfa_line.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_line.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_ffline.cpp b/xfa/fxfa/cxfa_ffline.cpp
index ee8ca1841a..cdaca4a88f 100644
--- a/xfa/fxfa/cxfa_ffline.cpp
+++ b/xfa/fxfa/cxfa_ffline.cpp
@@ -96,11 +96,11 @@ void CXFA_FFLine::RenderWidget(CXFA_Graphics* pGS,
float fLineWidth = 1.0f;
XFA_AttributeEnum iStrokeType = XFA_AttributeEnum::Unknown;
XFA_AttributeEnum iCap = XFA_AttributeEnum::Unknown;
- CXFA_Edge* edge = line->GetEdge();
- if (edge) {
- if (!edge->IsVisible())
- return;
+ CXFA_Edge* edge = line->GetEdgeIfExists();
+ if (edge && !edge->IsVisible())
+ return;
+ if (edge) {
lineColor = edge->GetColor();
iStrokeType = edge->GetStrokeType();
fLineWidth = edge->GetThickness();
diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_line.cpp
index d4159c3f72..4e656c2999 100644
--- a/xfa/fxfa/parser/cxfa_line.cpp
+++ b/xfa/fxfa/parser/cxfa_line.cpp
@@ -50,6 +50,6 @@ bool CXFA_Line::GetSlope() {
return JSObject()->GetEnum(XFA_Attribute::Slope) == XFA_AttributeEnum::Slash;
}
-CXFA_Edge* CXFA_Line::GetEdge() {
+CXFA_Edge* CXFA_Line::GetEdgeIfExists() {
return GetChild<CXFA_Edge>(0, XFA_Element::Edge, false);
}
diff --git a/xfa/fxfa/parser/cxfa_line.h b/xfa/fxfa/parser/cxfa_line.h
index 1b950e4641..18faacd16d 100644
--- a/xfa/fxfa/parser/cxfa_line.h
+++ b/xfa/fxfa/parser/cxfa_line.h
@@ -18,7 +18,7 @@ class CXFA_Line : public CXFA_Node {
XFA_AttributeEnum GetHand();
bool GetSlope();
- CXFA_Edge* GetEdge();
+ CXFA_Edge* GetEdgeIfExists();
};
#endif // XFA_FXFA_PARSER_CXFA_LINE_H_