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/fwl | |
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/fwl')
-rw-r--r-- | xfa/fwl/cfwl_checkbox.cpp | 2 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widget.cpp | 6 | ||||
-rw-r--r-- | xfa/fwl/cfwl_widget.h | 2 | ||||
-rw-r--r-- | xfa/fwl/ifwl_themeprovider.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp index 42b6cadc83..7e78efae63 100644 --- a/xfa/fwl/cfwl_checkbox.cpp +++ b/xfa/fwl/cfwl_checkbox.cpp @@ -137,7 +137,7 @@ void CFWL_CheckBox::Layout() { m_rtCaption.height); CalcTextRect(L"Check box", m_pProperties->m_pThemeProvider, m_dwTTOStyles, - m_iTTOAlign, rtFocus); + m_iTTOAlign, &rtFocus); m_rtFocus = CFX_RectF(m_rtCaption.TopLeft(), std::max(m_rtCaption.width, rtFocus.width), diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index c8d0db682a..e891cd1cbb 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -332,7 +332,7 @@ CFX_SizeF CFWL_Widget::CalcTextSize(const WideString& wsText, calPart.m_iTTOAlign = FDE_TextAlignment::kTopLeft; float fWidth = bMultiLine ? FWL_WGT_CalcMultiLineDefWidth : FWL_WGT_CalcWidth; CFX_RectF rect(0, 0, fWidth, FWL_WGT_CalcHeight); - pTheme->CalcTextRect(&calPart, rect); + pTheme->CalcTextRect(&calPart, &rect); return CFX_SizeF(rect.width, rect.height); } @@ -340,13 +340,13 @@ void CFWL_Widget::CalcTextRect(const WideString& wsText, IFWL_ThemeProvider* pTheme, const FDE_TextStyle& dwTTOStyles, FDE_TextAlignment iTTOAlign, - CFX_RectF& rect) { + CFX_RectF* pRect) { CFWL_ThemeText calPart; calPart.m_pWidget = this; calPart.m_wsText = wsText; calPart.m_dwTTOStyles = dwTTOStyles; calPart.m_iTTOAlign = iTTOAlign; - pTheme->CalcTextRect(&calPart, rect); + pTheme->CalcTextRect(&calPart, pRect); } void CFWL_Widget::SetFocus(bool bFocus) { diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 66ec0e170c..85f9b768d3 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -134,7 +134,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate { IFWL_ThemeProvider* pTheme, const FDE_TextStyle& dwTTOStyles, FDE_TextAlignment iTTOAlign, - CFX_RectF& rect); + CFX_RectF* pRect); void SetGrab(bool bSet); void RegisterEventTarget(CFWL_Widget* pEventSource); void UnregisterEventTarget(); diff --git a/xfa/fwl/ifwl_themeprovider.h b/xfa/fwl/ifwl_themeprovider.h index eba308597c..78c3e19fe2 100644 --- a/xfa/fwl/ifwl_themeprovider.h +++ b/xfa/fwl/ifwl_themeprovider.h @@ -23,7 +23,7 @@ class IFWL_ThemeProvider { virtual void DrawBackground(CFWL_ThemeBackground* pParams) = 0; virtual void DrawText(CFWL_ThemeText* pParams) = 0; - virtual void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) = 0; + virtual void CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF* pRect) = 0; virtual float GetCXBorderSize() const = 0; virtual float GetCYBorderSize() const = 0; virtual CFX_RectF GetUIMargin(CFWL_ThemePart* pThemePart) const = 0; |