From 738be2b591adf9acb6ab08e741e75842a4213e10 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 21 Nov 2016 11:25:17 -0800 Subject: Remove FWL_GetThemeLayout FWL_GetThemeLayout is only called in one place with 0 as the parameter. This can never be true, so replace it with false at the callsite. Review-Url: https://codereview.chromium.org/2521673002 --- xfa/fwl/theme/cfwl_widgettp.cpp | 6 +----- xfa/fwl/theme/cfwl_widgettp.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 2b713979ba..ab8256ce83 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -118,7 +118,7 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart, } bool CFWL_WidgetTP::IsCustomizedLayout(IFWL_Widget* pWidget) { - return !!FWL_GetThemeLayout(0); + return false; } void CFWL_WidgetTP::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { @@ -695,10 +695,6 @@ void FWLTHEME_Release() { CFWL_FontManager::DestroyInstance(); } -uint32_t FWL_GetThemeLayout(uint32_t dwThemeID) { - return 0xffff0000 & dwThemeID; -} - uint32_t FWL_GetThemeColor(uint32_t dwThemeID) { return 0x0000ffff & dwThemeID; } diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index b269fb2b04..bc546453d0 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -219,7 +219,6 @@ class CFWL_WidgetTP { }; void FWLTHEME_Release(); -uint32_t FWL_GetThemeLayout(uint32_t dwThemeID); uint32_t FWL_GetThemeColor(uint32_t dwThemeID); class CFWL_FontData { -- cgit v1.2.3