diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-05-01 21:00:44 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-01 21:00:44 +0000 |
| commit | 0b0b0b32bc2b03f09b7156b855c626a44703f9c4 (patch) | |
| tree | 411225574a545e49ae4d883082be6a013460b7c6 /xfa/fxfa | |
| parent | 9294ffdf371fbae8c166dd5e3c63955f1d3ab18e (diff) | |
| download | pdfium-0b0b0b32bc2b03f09b7156b855c626a44703f9c4.tar.xz | |
Transform rect out param from reference to pointer in XFA code.
Change-Id: Ib5f8b8754bca8198d9122700d7d876b45d1428da
Reviewed-on: https://pdfium-review.googlesource.com/31852
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/cxfa_fwltheme.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_fwltheme.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index d1739f4e97..94d963d70e 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp @@ -227,7 +227,7 @@ CFX_SizeF CXFA_FWLTheme::GetSpaceAboveBelow(CFWL_ThemePart* pThemePart) const { return sizeAboveBelow; } -void CXFA_FWLTheme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { +void CXFA_FWLTheme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF* pRect) { if (pParams->m_pWidget->GetClassID() == FWL_Type::MonthCalendar) { CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pParams->m_pWidget); if (!pWidget || !pParams || !m_pTextOut) @@ -238,7 +238,7 @@ void CXFA_FWLTheme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor); m_pTextOut->SetAlignment(pParams->m_iTTOAlign); m_pTextOut->SetStyles(pParams->m_dwTTOStyles); - m_pTextOut->CalcLogicSize(pParams->m_wsText, rect); + m_pTextOut->CalcLogicSize(pParams->m_wsText, pRect); return; } @@ -255,7 +255,7 @@ void CXFA_FWLTheme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { m_pTextOut->SetAlignment(pParams->m_iTTOAlign); m_pTextOut->SetStyles(pParams->m_dwTTOStyles); - m_pTextOut->CalcLogicSize(pParams->m_wsText, rect); + m_pTextOut->CalcLogicSize(pParams->m_wsText, pRect); } CFWL_WidgetTP* CXFA_FWLTheme::GetTheme(CFWL_Widget* pWidget) const { diff --git a/xfa/fxfa/cxfa_fwltheme.h b/xfa/fxfa/cxfa_fwltheme.h index b8f8ff68be..289bbd4fe5 100644 --- a/xfa/fxfa/cxfa_fwltheme.h +++ b/xfa/fxfa/cxfa_fwltheme.h @@ -34,7 +34,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { // IFWL_ThemeProvider: void DrawBackground(CFWL_ThemeBackground* pParams) override; void DrawText(CFWL_ThemeText* pParams) override; - void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) override; + void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF* pRect) override; float GetCXBorderSize() const override; float GetCYBorderSize() const override; CFX_RectF GetUIMargin(CFWL_ThemePart* pThemePart) const override; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 3399023037..884a7d089c 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -2837,7 +2837,7 @@ void CXFA_Node::CalculateTextContentSize(CXFA_FFDoc* doc, CFX_SizeF& size) { pTextOut->SetStyles(dwStyles); } - layoutData->m_pTextOut->CalcLogicSize(wsText, size); + layoutData->m_pTextOut->CalcLogicSize(wsText, &size); } bool CXFA_Node::CalculateTextEditAutoSize(CXFA_FFDoc* doc, CFX_SizeF& size) { |