commit 765d1ebe41defa659a703a2f0ff5284c0da96a95
author Lei Zhang <thestig@chromium.org> Wed Mar 21 04:36:35 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Mar 21 04:36:35 2018 +0000
tree adaec2bce49268f18cd51ee05120d6a05dc74b3a
parent da89ac4c49013ce8d2d1d81e389cd37c0ee2ef27

Rename one ArgbEncode() variant to AlphaAndColorRefToArgb().

Mark the other ArgbEncode() variant as constexpr.

Change-Id: I84207d805766e5efc669638bd8a15cfead356a41
Reviewed-on: https://pdfium-review.googlesource.com/28577
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index a0b6713..d5204fe 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -1373,7 +1373,7 @@
           pObj->m_GeneralState.GetTransferFunc()->TranslateColor(colorref);
     }
   }
-  return m_Options.TranslateColor(ArgbEncode(alpha, colorref));
+  return m_Options.TranslateColor(AlphaAndColorRefToArgb(alpha, colorref));
 }
 
 FX_ARGB CPDF_RenderStatus::GetStrokeArgb(CPDF_PageObject* pObj) const {
@@ -1400,7 +1400,7 @@
           pObj->m_GeneralState.GetTransferFunc()->TranslateColor(colorref);
     }
   }
-  return m_Options.TranslateColor(ArgbEncode(alpha, colorref));
+  return m_Options.TranslateColor(AlphaAndColorRefToArgb(alpha, colorref));
 }
 
 void CPDF_RenderStatus::ProcessClipPath(const CPDF_ClipPath& ClipPath,

core/fxge/dib/fx_dib_main.cpp

diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 5d7b585..6c3a236 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -87,9 +87,9 @@
   return FXSYS_RGB(FXARGB_R(argb), FXARGB_G(argb), FXARGB_B(argb));
 }
 
-uint32_t ArgbEncode(int a, FX_COLORREF bgr) {
-  return FXARGB_MAKE(a, FXSYS_GetRValue(bgr), FXSYS_GetGValue(bgr),
-                     FXSYS_GetBValue(bgr));
+FX_ARGB AlphaAndColorRefToArgb(int a, FX_COLORREF colorref) {
+  return FXARGB_MAKE(a, FXSYS_GetRValue(colorref), FXSYS_GetGValue(colorref),
+                     FXSYS_GetBValue(colorref));
 }
 
 FX_ARGB StringToFXARGB(const WideStringView& wsValue) {

core/fxge/fx_dib.h

diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h
index 5dcfac4..0878dfd 100644
--- a/core/fxge/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -99,11 +99,11 @@
 // Returns FX_COLORREF.
 FX_COLORREF ArgbToColorRef(FX_ARGB argb);
 
-inline FX_ARGB ArgbEncode(int a, int r, int g, int b) {
+constexpr FX_ARGB ArgbEncode(int a, int r, int g, int b) {
   return (a << 24) | (r << 16) | (g << 8) | b;
 }
-// TODO(thestig): Rename to AlphaAndColorRefToArgb().
-FX_ARGB ArgbEncode(int a, FX_COLORREF bgr);
+
+FX_ARGB AlphaAndColorRefToArgb(int a, FX_COLORREF colorref);
 
 FX_ARGB StringToFXARGB(const WideStringView& view);
 

fpdfsdk/cpdfsdk_widget.cpp

diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 6d81829..055ad63 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -707,9 +707,10 @@
   rcDevice.Normalize();
 
   FX_RECT rcDev = rcDevice.ToFxRect();
-  pDevice->FillRect(
-      &rcDev, ArgbEncode(static_cast<int>(m_pInterForm->GetHighlightAlpha()),
-                         m_pInterForm->GetHighlightColor(fieldType)));
+  pDevice->FillRect(&rcDev,
+                    AlphaAndColorRefToArgb(
+                        static_cast<int>(m_pInterForm->GetHighlightAlpha()),
+                        m_pInterForm->GetHighlightColor(fieldType)));
 }
 
 CFX_FloatRect CPDFSDK_Widget::GetClientRect() const {

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 0833759..cb6ce1c 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -596,8 +596,9 @@
   if (!pInterForm)
     return 0;
 
-  return ArgbEncode(pInterForm->GetHighlightAlpha(),
-                    pInterForm->GetHighlightColor(FormFieldType::kXFA));
+  return AlphaAndColorRefToArgb(
+      pInterForm->GetHighlightAlpha(),
+      pInterForm->GetHighlightColor(FormFieldType::kXFA));
 }
 
 bool CPDFXFA_DocEnvironment::NotifySubmit(bool bPrevOrPost) {

xfa/fxfa/parser/cxfa_stipple.cpp

diff --git a/xfa/fxfa/parser/cxfa_stipple.cpp b/xfa/fxfa/parser/cxfa_stipple.cpp
index 2c36e11..19ca0ca 100644
--- a/xfa/fxfa/parser/cxfa_stipple.cpp
+++ b/xfa/fxfa/parser/cxfa_stipple.cpp
@@ -64,7 +64,7 @@
   int32_t alpha;
   FX_COLORREF colorref;
   std::tie(alpha, colorref) = ArgbToAlphaAndColorRef(crColor);
-  FX_ARGB cr = ArgbEncode(iRate * alpha / 100, colorref);
+  FX_ARGB cr = AlphaAndColorRefToArgb(iRate * alpha / 100, colorref);
 
   pGS->SaveGraphState();
   pGS->SetFillColor(CXFA_GEColor(cr));