commit e9b7be916f4b27f251df044639cbf7efb9bd6b72
author Tom Sepez <tsepez@chromium.org> Sat Mar 30 02:51:58 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Mar 30 02:51:58 2024 +0000
tree 07128f01aef9da52b4f6b41966b297701b189fbc
parent 008339888ab0adcc5e9288905311f21ecb7c155a

Make SBThemeData::clrBtnBK a one-dimensional array.

The code only ever uses the values at [N][1].

-- convert to std::array while at it.

Change-Id: I94ace32fb6b9d936394992619e138620eaef764b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/117857
Reviewed-by: Thomas Sepez <tsepez@google.com>
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 4d0c6b7..1fbc3b8 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -76,8 +76,8 @@
     return;
 
   FillSolidRect(pGraphics,
-                m_pThemeData->clrBtnBK[static_cast<size_t>(eState) - 1][1],
-                rect, matrix);
+                m_pThemeData->clrBtnBK[static_cast<size_t>(eState) - 1], rect,
+                matrix);
 
   CFGAS_GEGraphics::StateRestorer restorer(pGraphics);
   CFGAS_GEPath path;
@@ -134,14 +134,10 @@
 void CFWL_ScrollBarTP::SetThemeData() {
   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->clrBtnBK[0] = ArgbEncode(0xff, 182, 205, 251);
+  m_pThemeData->clrBtnBK[1] = ArgbEncode(0xff, 204, 225, 255);
+  m_pThemeData->clrBtnBK[2] = ArgbEncode(0xff, 146, 179, 249);
+  m_pThemeData->clrBtnBK[3] = 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);

xfa/fwl/theme/cfwl_scrollbartp.h

diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 714cf4d..3100889 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -7,6 +7,7 @@
 #ifndef XFA_FWL_THEME_CFWL_SCROLLBARTP_H_
 #define XFA_FWL_THEME_CFWL_SCROLLBARTP_H_
 
+#include <array>
 #include <memory>
 
 #include "fxjs/gc/heap.h"
@@ -24,8 +25,8 @@
   struct SBThemeData {
     FX_ARGB clrTrackBKStart;
     FX_ARGB clrTrackBKEnd;
-    FX_ARGB clrBtnBK[4][2];
-    FX_ARGB clrBtnBorder[4];
+    std::array<FX_ARGB, 4> clrBtnBK;
+    std::array<FX_ARGB, 4> clrBtnBorder;
   };
 
   CFWL_ScrollBarTP();