commit 6c2f74be375971b7fec761b34a958d79e27be3aa
author Tom Sepez <tsepez@chromium.org> Mon May 24 23:37:12 2021 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 24 23:37:12 2021 +0000
tree 0e91ec5cc1d261e971a60d1c8bbae67bcac0248f
parent 1138ffebfcbb661e3478119f2efc28bc8eae5314

Remove references to "paw" in CFWL_ScrollBarTP

They are unused.

-- sort initializations into a saner order.

Change-Id: I92aad069a4d5d8167913beb389f7ff82c4a4cc5d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80934
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fwl/theme/cfwl_scrollbartp.cpp

diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp
index f526922..ad86e65 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -45,7 +45,7 @@
       break;
     }
     case CFWL_Part::Thumb: {
-      DrawThumbBtn(pGraphics, pParams.m_PartRect, bVert, eState, true,
+      DrawThumbBtn(pGraphics, pParams.m_PartRect, bVert, eState,
                    pParams.m_matrix);
       break;
     }
@@ -68,7 +68,6 @@
                                     const CFX_RectF& input_rect,
                                     bool bVert,
                                     FWLTHEME_STATE eState,
-                                    bool bPawButton,
                                     const CFX_Matrix& matrix) {
   if (eState < FWLTHEME_STATE_Normal || eState > FWLTHEME_STATE_Disable)
     return;
@@ -136,26 +135,18 @@
 }
 
 void CFWL_ScrollBarTP::SetThemeData() {
-  m_pThemeData->clrPawColorLight[3] = ArgbEncode(0xff, 208, 223, 172);
-  m_pThemeData->clrPawColorDark[3] = ArgbEncode(0xff, 140, 157, 115);
-  m_pThemeData->clrBtnBK[3][0] = ArgbEncode(0xff, 164, 180, 139);
-  m_pThemeData->clrBtnBK[3][1] = ArgbEncode(0xff, 141, 157, 115);
-  m_pThemeData->clrBtnBorder[3] = ArgbEncode(0xff, 236, 233, 216);
-  m_pThemeData->clrPawColorLight[0] = ArgbEncode(0xff, 238, 244, 254);
-  m_pThemeData->clrPawColorDark[0] = ArgbEncode(0xff, 140, 176, 248);
-  m_pThemeData->clrBtnBK[0][0] = ArgbEncode(0xff, 197, 213, 252);
-  m_pThemeData->clrBtnBK[0][1] = ArgbEncode(0xff, 182, 205, 251);
-  m_pThemeData->clrBtnBorder[0] = ArgbEncode(0xff, 148, 176, 221);
-  m_pThemeData->clrPawColorLight[1] = ArgbEncode(0xff, 252, 253, 255);
-  m_pThemeData->clrPawColorDark[1] = ArgbEncode(0xff, 156, 197, 255);
-  m_pThemeData->clrBtnBK[1][0] = ArgbEncode(0xff, 216, 232, 255);
-  m_pThemeData->clrBtnBK[1][1] = ArgbEncode(0xff, 204, 225, 255);
-  m_pThemeData->clrBtnBorder[1] = ArgbEncode(0xff, 218, 230, 254);
-  m_pThemeData->clrPawColorLight[2] = ArgbEncode(0xff, 207, 221, 253);
-  m_pThemeData->clrPawColorDark[2] = ArgbEncode(0xff, 131, 158, 216);
-  m_pThemeData->clrBtnBK[2][0] = ArgbEncode(0xff, 167, 190, 245);
-  m_pThemeData->clrBtnBK[2][1] = ArgbEncode(0xff, 146, 179, 249);
-  m_pThemeData->clrBtnBorder[2] = ArgbEncode(0xff, 124, 159, 211);
   m_pThemeData->clrTrackBKStart = ArgbEncode(0xff, 243, 241, 236);
   m_pThemeData->clrTrackBKEnd = ArgbEncode(0xff, 254, 254, 251);
+  m_pThemeData->clrBtnBK[0][0] = ArgbEncode(0xff, 197, 213, 252);
+  m_pThemeData->clrBtnBK[0][1] = ArgbEncode(0xff, 182, 205, 251);
+  m_pThemeData->clrBtnBK[1][0] = ArgbEncode(0xff, 216, 232, 255);
+  m_pThemeData->clrBtnBK[1][1] = ArgbEncode(0xff, 204, 225, 255);
+  m_pThemeData->clrBtnBK[2][0] = ArgbEncode(0xff, 167, 190, 245);
+  m_pThemeData->clrBtnBK[2][1] = ArgbEncode(0xff, 146, 179, 249);
+  m_pThemeData->clrBtnBK[3][0] = ArgbEncode(0xff, 164, 180, 139);
+  m_pThemeData->clrBtnBK[3][1] = ArgbEncode(0xff, 141, 157, 115);
+  m_pThemeData->clrBtnBorder[0] = ArgbEncode(0xff, 148, 176, 221);
+  m_pThemeData->clrBtnBorder[1] = ArgbEncode(0xff, 218, 230, 254);
+  m_pThemeData->clrBtnBorder[2] = ArgbEncode(0xff, 124, 159, 211);
+  m_pThemeData->clrBtnBorder[3] = ArgbEncode(0xff, 236, 233, 216);
 }

xfa/fwl/theme/cfwl_scrollbartp.h

diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index f1f047c..63d62af 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -24,8 +24,6 @@
   struct SBThemeData {
     FX_ARGB clrTrackBKStart;
     FX_ARGB clrTrackBKEnd;
-    FX_ARGB clrPawColorLight[4];
-    FX_ARGB clrPawColorDark[4];
     FX_ARGB clrBtnBK[4][2];
     FX_ARGB clrBtnBorder[4];
   };
@@ -36,7 +34,6 @@
                     const CFX_RectF& rect,
                     bool bVert,
                     FWLTHEME_STATE eState,
-                    bool bPawButton,
                     const CFX_Matrix& matrix);
   void DrawTrack(CFGAS_GEGraphics* pGraphics,
                  const CFX_RectF& rect,