From 791a0ccd25474d9306ad0df425575869caec3048 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 15 Dec 2016 13:42:52 -0800
Subject: Remove unused widget state flags

These widget state flags are not set and mostly unused. Removed.

Review-Url: https://codereview.chromium.org/2573133002
---
 xfa/fwl/cfwl_edit.cpp    | 8 --------
 xfa/fwl/cfwl_form.cpp    | 6 ++----
 xfa/fwl/cfwl_themepart.h | 1 -
 xfa/fwl/cfwl_widget.cpp  | 4 ----
 xfa/fwl/cfwl_widget.h    | 1 -
 xfa/fwl/fwl_widgetdef.h  | 5 +----
 6 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index 5cd0c90ac8..f51249eaca 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -538,14 +538,6 @@ void CFWL_Edit::DrawContent(CFX_Graphics* pGraphics,
   }
 
   bool bShowSel = !!(m_pProperties->m_dwStates & FWL_WGTSTATE_Focused);
-  if (bShowSel) {
-    CFWL_Widget* pForm = m_pWidgetMgr->GetSystemFormWidget(this);
-    if (pForm) {
-      bShowSel = (pForm->GetStates() & FWL_WGTSTATE_Deactivated) !=
-                 FWL_WGTSTATE_Deactivated;
-    }
-  }
-
   int32_t nSelCount = m_EdtEngine.CountSelRanges();
   if (bShowSel && nSelCount > 0) {
     int32_t nPageCharStart = pPage->GetCharStart();
diff --git a/xfa/fwl/cfwl_form.cpp b/xfa/fwl/cfwl_form.cpp
index 75ddf43702..dcb2555651 100644
--- a/xfa/fwl/cfwl_form.cpp
+++ b/xfa/fwl/cfwl_form.cpp
@@ -83,8 +83,6 @@ void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
     return;
 
   IFWL_ThemeProvider* pTheme = m_pProperties->m_pThemeProvider;
-  bool bInactive = !IsActive();
-  int32_t iState = bInactive ? CFWL_PartState_Inactive : CFWL_PartState_Normal;
   DrawBackground(pGraphics, pTheme);
 
 #ifdef FWL_UseMacSystemBorder
@@ -92,7 +90,7 @@ void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
 #endif
   CFWL_ThemeBackground param;
   param.m_pWidget = this;
-  param.m_dwStates = iState;
+  param.m_dwStates = CFWL_PartState_Normal;
   param.m_pGraphics = pGraphics;
   param.m_rtPart = m_rtRelative;
   if (pMatrix)
@@ -105,7 +103,7 @@ void CFWL_Form::DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix) {
       FWL_WGTSTYLE_EdgeNone) {
     param.m_iPart = CFWL_Part::Edge;
     param.m_rtPart = GetEdgeRect();
-    param.m_dwStates = iState;
+    param.m_dwStates = CFWL_PartState_Normal;
     pTheme->DrawBackground(&param);
   }
 }
diff --git a/xfa/fwl/cfwl_themepart.h b/xfa/fwl/cfwl_themepart.h
index 677d07b9c0..39009878b8 100644
--- a/xfa/fwl/cfwl_themepart.h
+++ b/xfa/fwl/cfwl_themepart.h
@@ -68,7 +68,6 @@ enum CFWL_PartState {
   CFWL_PartState_Focused = 1 << 5,
   CFWL_PartState_HightLight = 1 << 6,
   CFWL_PartState_Hovered = 1 << 7,
-  CFWL_PartState_Inactive = 1 << 8,
   CFWL_PartState_Neutral = 1 << 9,
   CFWL_PartState_Pressed = 1 << 10,
   CFWL_PartState_ReadOnly = 1 << 11,
diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp
index 40b922395e..a1ed56fb08 100644
--- a/xfa/fwl/cfwl_widget.cpp
+++ b/xfa/fwl/cfwl_widget.cpp
@@ -274,10 +274,6 @@ bool CFWL_Widget::IsEnabled() const {
   return (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) == 0;
 }
 
-bool CFWL_Widget::IsActive() const {
-  return (m_pProperties->m_dwStates & FWL_WGTSTATE_Deactivated) == 0;
-}
-
 bool CFWL_Widget::HasBorder() const {
   return !!(m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border);
 }
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index e2fce0e1ac..e2ba4071cb 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -119,7 +119,6 @@ class CFWL_Widget : public IFWL_WidgetDelegate {
               CFWL_Widget* pOuter);
 
   bool IsEnabled() const;
-  bool IsActive() const;
   bool IsLocked() const { return m_iLock > 0; }
   bool HasBorder() const;
   bool HasEdge() const;
diff --git a/xfa/fwl/fwl_widgetdef.h b/xfa/fwl/fwl_widgetdef.h
index fd90fd3bab..09ddef5e8d 100644
--- a/xfa/fwl/fwl_widgetdef.h
+++ b/xfa/fwl/fwl_widgetdef.h
@@ -35,11 +35,8 @@
 #define FWL_WGTSTYLE_TransParent (1L << 27)
 #define FWL_WGTSTYLE_NoBackground (1L << 28)
 #define FWL_WGTSTYLE_WindowTypeMask (3L << 0)
-#define FWL_WGTSTATE_Restored (0L << 0)
-#define FWL_WGTSTATE_Minimized (1L << 0)
-#define FWL_WGTSTATE_Maximized (2L << 0)
+
 #define FWL_WGTSTATE_Disabled (1L << 2)
-#define FWL_WGTSTATE_Deactivated (1L << 3)
 #define FWL_WGTSTATE_Focused (1L << 4)
 #define FWL_WGTSTATE_Invisible (1L << 5)
 #define FWL_WGTSTATE_MAX (6)
-- 
cgit v1.2.3