From 0ed26b29690bf65055ee40e611bb3f58c428d4f8 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Mon, 21 Nov 2016 11:15:32 -0800
Subject: Remove theme id from themeproviders

The theme ID is never set, so it's always 0. This CL removes the Set/Get methods
and updates the code to use 0 in place of m_dwThemeId.

Review-Url: https://codereview.chromium.org/2519113002
---
 xfa/fwl/theme/cfwl_widgettp.cpp | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'xfa/fwl/theme/cfwl_widgettp.cpp')

diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index 9eb598bc8c..2b713979ba 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -41,18 +41,6 @@ bool CFWL_WidgetTP::IsValidWidget(IFWL_Widget* pWidget) {
   return false;
 }
 
-uint32_t CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) {
-  return m_dwThemeID;
-}
-
-uint32_t CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID) {
-  uint32_t dwOld = m_dwThemeID;
-  m_dwThemeID = dwThemeID;
-  if (CFWL_ArrowData::HasInstance())
-    CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(dwThemeID));
-  return dwOld;
-}
-
 void CFWL_WidgetTP::DrawBackground(CFWL_ThemeBackground* pParams) {}
 
 void CFWL_WidgetTP::DrawText(CFWL_ThemeText* pParams) {
@@ -112,8 +100,7 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart,
       return m_pFDEFont;
     }
     case CFWL_WidgetCapacity::TextSelColor: {
-      m_dwValue = (m_dwThemeID == 0) ? FWLTHEME_CAPACITY_TextSelColor
-                                     : FWLTHEME_COLOR_Green_BKSelected;
+      m_dwValue = FWLTHEME_CAPACITY_TextSelColor;
       return &m_dwValue;
     }
     case CFWL_WidgetCapacity::LineHeight: {
@@ -131,7 +118,7 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart,
 }
 
 bool CFWL_WidgetTP::IsCustomizedLayout(IFWL_Widget* pWidget) {
-  return !!FWL_GetThemeLayout(m_dwThemeID);
+  return !!FWL_GetThemeLayout(0);
 }
 
 void CFWL_WidgetTP::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) {
@@ -144,9 +131,7 @@ void CFWL_WidgetTP::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) {
                             pParams->m_wsText.GetLength(), rect);
 }
 
-void CFWL_WidgetTP::Initialize() {
-  m_dwThemeID = 0;
-}
+void CFWL_WidgetTP::Initialize() {}
 
 void CFWL_WidgetTP::Finalize() {
   if (!m_pTextOut)
@@ -184,8 +169,7 @@ CFGAS_GEFont* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) {
   return m_pFDEFont;
 }
 
-CFWL_WidgetTP::CFWL_WidgetTP()
-    : m_dwRefCount(1), m_pFDEFont(nullptr), m_dwThemeID(0) {}
+CFWL_WidgetTP::CFWL_WidgetTP() : m_dwRefCount(1), m_pFDEFont(nullptr) {}
 
 void CFWL_WidgetTP::InitTTO() {
   if (m_pTextOut)
@@ -213,7 +197,7 @@ void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics,
   if (!pRect)
     return;
   pGraphics->SaveGraphState();
-  CFX_Color crStroke(FWL_GetThemeColor(m_dwThemeID) == 0
+  CFX_Color crStroke(FWL_GetThemeColor(0) == 0
                          ? ArgbEncode(255, 127, 157, 185)
                          : FWLTHEME_COLOR_Green_BKSelected);
   pGraphics->SetStrokeColor(&crStroke);
@@ -611,7 +595,7 @@ void CFWL_WidgetTP::DrawBtn(CFX_Graphics* pGraphics,
   CFX_Path path;
   path.Create();
   if (!CFWL_ArrowData::HasInstance()) {
-    CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(m_dwThemeID));
+    CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(0));
   }
   CFWL_ArrowData::CColorData* pColorData =
       CFWL_ArrowData::GetInstance()->m_pColorData.get();
@@ -635,7 +619,7 @@ void CFWL_WidgetTP::DrawArrowBtn(CFX_Graphics* pGraphics,
                                  CFX_Matrix* pMatrix) {
   DrawBtn(pGraphics, pRect, eState, pMatrix);
   if (!CFWL_ArrowData::HasInstance()) {
-    CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(m_dwThemeID));
+    CFWL_ArrowData::GetInstance()->SetColorData(FWL_GetThemeColor(0));
   }
   CFWL_ArrowData::CColorData* pColorData =
       CFWL_ArrowData::GetInstance()->m_pColorData.get();
-- 
cgit v1.2.3