summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-10 19:44:16 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-10 19:44:16 +0000
commitccd7899b2d662c0a1be6cd52c6b6068472c27375 (patch)
tree13baee4d5893332917cae9f9e49d35473f086176 /xfa/fxfa
parent948879d23226aea31aa9ae5f6eb1fb8572f0fc05 (diff)
downloadpdfium-ccd7899b2d662c0a1be6cd52c6b6068472c27375.tar.xz
Rename GetOrCreateFont to GetOrCreateFontIfPossible
This CL makes it explicit that GetOrCreateFontIfPossible can return nullptr. Change-Id: Ib5be6995e4225ad596dfb78a94f0bc56802716cc Reviewed-on: https://pdfium-review.googlesource.com/22674 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_node.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 8c0b1956fe..d44b203f8c 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1542,7 +1542,7 @@ CXFA_Caption* CXFA_Node::GetCaptionIfExists() const {
return JSObject()->GetProperty<CXFA_Caption>(0, XFA_Element::Caption);
}
-CXFA_Font* CXFA_Node::GetOrCreateFont() {
+CXFA_Font* CXFA_Node::GetOrCreateFontIfPossible() {
return JSObject()->GetOrCreateProperty<CXFA_Font>(0, XFA_Element::Font);
}
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 673c430dbb..69cd12c86b 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -241,7 +241,7 @@ class CXFA_Node : public CXFA_Object {
CXFA_Caption* GetCaptionIfExists() const;
CXFA_Font* GetFontIfExists() const;
- CXFA_Font* GetOrCreateFont();
+ CXFA_Font* GetOrCreateFontIfPossible();
float GetFontSize() const;
FX_ARGB GetTextColor() const;
float GetLineHeight() const;