diff options
| author | thestig <thestig@chromium.org> | 2016-04-28 17:29:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 17:29:19 -0700 |
| commit | 495bda110a6ea8e7a6fc313ec0232a9ca6e3cfdc (patch) | |
| tree | 42abda300274f81009bdb9866e0f7e3f81164726 /xfa/fxfa/app/xfa_textlayout.cpp | |
| parent | a31098417852bdf13e693a6e0913e0706cf94098 (diff) | |
| download | pdfium-495bda110a6ea8e7a6fc313ec0232a9ca6e3cfdc.tar.xz | |
Do not check pointers before deleting them.
XFA edition.
Review-Url: https://codereview.chromium.org/1925363002
Diffstat (limited to 'xfa/fxfa/app/xfa_textlayout.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index f2479b7d2f..9ed84e1604 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -996,6 +996,7 @@ int32_t CXFA_TextLayout::CountBlocks() const { int32_t iCount = m_Blocks.GetSize() / 2; return iCount > 0 ? iCount : 1; } + FX_BOOL CXFA_TextLayout::CalcSize(const CFX_SizeF& minSize, const CFX_SizeF& maxSize, CFX_SizeF& defaultSize) { @@ -1014,13 +1015,12 @@ FX_BOOL CXFA_TextLayout::CalcSize(const CFX_SizeF& minSize, if (fLinePos < 0.1f) { fLinePos = m_textParser.GetFontSize(m_pTextProvider, NULL); } - if (m_pTabstopContext) { - delete m_pTabstopContext; - m_pTabstopContext = NULL; - } + delete m_pTabstopContext; + m_pTabstopContext = nullptr; defaultSize = CFX_SizeF(m_fMaxWidth, fLinePos); return TRUE; } + FX_BOOL CXFA_TextLayout::Layout(const CFX_SizeF& size, FX_FLOAT* fHeight) { if (size.x < 1) { return FALSE; @@ -1035,15 +1035,13 @@ FX_BOOL CXFA_TextLayout::Layout(const CFX_SizeF& size, FX_FLOAT* fHeight) { FX_FLOAT fLinePos = 0; Loader(size, fLinePos, TRUE); UpdateAlign(size.y, fLinePos); - if (m_pTabstopContext) { - delete m_pTabstopContext; - m_pTabstopContext = NULL; - } - if (fHeight) { + delete m_pTabstopContext; + m_pTabstopContext = nullptr; + if (fHeight) *fHeight = fLinePos; - } return TRUE; } + FX_BOOL CXFA_TextLayout::Layout(int32_t iBlock) { if (m_pLoader == NULL || iBlock < 0 || iBlock >= CountBlocks()) { return FALSE; |