From 88b56f4dec7df76884f87fbc7eed44898a8ddd34 Mon Sep 17 00:00:00 2001 From: thestig Date: Fri, 24 Jun 2016 13:23:35 -0700 Subject: Remove IFWL_ToolTipTarget. It does not have an implementation. BUG=623135 Review-Url: https://codereview.chromium.org/2094013002 --- xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'xfa/fwl/basewidget') diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp index e09113e19e..85af738555 100644 --- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp @@ -15,7 +15,6 @@ #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_tooltiptarget.h" #include "xfa/fwl/theme/cfwl_widgettp.h" // static @@ -142,22 +141,18 @@ FWL_Error CFWL_ToolTipImp::GetClientRect(CFX_RectF& rect) { rect.Deflate(x, t, x, y); return FWL_Error::Succeeded; } + FWL_Error CFWL_ToolTipImp::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) { - IFWL_ToolTipTarget* toolTipTarget = - CFWL_ToolTipContainer::getInstance()->GetCurrentToolTipTarget(); - if (toolTipTarget && !toolTipTarget->UseDefaultTheme()) { - return toolTipTarget->DrawToolTip(pGraphics, pMatrix, m_pInterface); - } - if (!pGraphics) - return FWL_Error::Indefinite; - if (!m_pProperties->m_pThemeProvider) + if (!pGraphics || !m_pProperties->m_pThemeProvider) return FWL_Error::Indefinite; + IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider; DrawBkground(pGraphics, pTheme, pMatrix); DrawText(pGraphics, pTheme, pMatrix); return FWL_Error::Succeeded; } + void CFWL_ToolTipImp::DrawBkground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix) { -- cgit v1.2.3