diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-10 19:44:26 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-10 19:44:26 +0000 |
| commit | 78d841011655b868486a45e0fe865a972742aa0c (patch) | |
| tree | e2bb52e930000b90d77aaf82af8903d106d63d58 /xfa/fxfa/parser | |
| parent | ccd7899b2d662c0a1be6cd52c6b6068472c27375 (diff) | |
| download | pdfium-78d841011655b868486a45e0fe865a972742aa0c.tar.xz | |
Rename GetMargin to GetMarginIfExists
This CL makes it explicit that GetMargin may return a nullptr.
Change-Id: I46780e8df9e966accc38baf56f8aa5149533db87
Reviewed-on: https://pdfium-review.googlesource.com/22675
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index d44b203f8c..d2c1e6fe8b 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1572,7 +1572,7 @@ FX_ARGB CXFA_Node::GetTextColor() const { return font ? font->GetColor() : 0xFF000000; } -CXFA_Margin* CXFA_Node::GetMargin() const { +CXFA_Margin* CXFA_Node::GetMarginIfExists() const { return JSObject()->GetProperty<CXFA_Margin>(0, XFA_Element::Margin); } diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 69cd12c86b..1972da9183 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -246,7 +246,7 @@ class CXFA_Node : public CXFA_Object { FX_ARGB GetTextColor() const; float GetLineHeight() const; - CXFA_Margin* GetMargin() const; + CXFA_Margin* GetMarginIfExists() const; CXFA_Para* GetPara() const; CXFA_Calculate* GetCalculate() const; CXFA_Validate* GetValidate() const; |