From bcdbeaea96d53800ee806f463108f54f79a19347 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 21 Aug 2018 23:07:21 +0000 Subject: Use UnownedPtr<> to theme provider in cfwl_widgetproperties.h Mark two other fields which must remain raw. Change-Id: Idcd9b074aad23f35dc6607feeaa4fa6701efffaa Reviewed-on: https://pdfium-review.googlesource.com/40916 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- xfa/fwl/cfwl_widget.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/cfwl_widget.cpp') diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index 4a8f2c0caa..309793c690 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp @@ -171,7 +171,7 @@ CFX_PointF CFWL_Widget::TransformTo(CFWL_Widget* pWidget, return point + CFX_PointF(szOffset.width, szOffset.height); } -CFX_Matrix CFWL_Widget::GetMatrix() { +CFX_Matrix CFWL_Widget::GetMatrix() const { if (!m_pProperties) return CFX_Matrix(); @@ -201,10 +201,6 @@ CFX_Matrix CFWL_Widget::GetMatrix() { return matrix; } -IFWL_ThemeProvider* CFWL_Widget::GetThemeProvider() const { - return m_pProperties->m_pThemeProvider; -} - void CFWL_Widget::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) { m_pProperties->m_pThemeProvider = pThemeProvider; } @@ -259,7 +255,7 @@ CFX_RectF CFWL_Widget::GetRelativeRect() { IFWL_ThemeProvider* CFWL_Widget::GetAvailableTheme() { if (m_pProperties->m_pThemeProvider) - return m_pProperties->m_pThemeProvider; + return m_pProperties->m_pThemeProvider.Get(); CFWL_Widget* pUp = this; do { -- cgit v1.2.3