summaryrefslogtreecommitdiff
path: root/core/fxge/fx_dib.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-03-21 04:36:35 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-03-21 04:36:35 +0000
commit765d1ebe41defa659a703a2f0ff5284c0da96a95 (patch)
treeadaec2bce49268f18cd51ee05120d6a05dc74b3a /core/fxge/fx_dib.h
parentda89ac4c49013ce8d2d1d81e389cd37c0ee2ef27 (diff)
downloadpdfium-765d1ebe41defa659a703a2f0ff5284c0da96a95.tar.xz
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>
Diffstat (limited to 'core/fxge/fx_dib.h')
-rw-r--r--core/fxge/fx_dib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/fx_dib.h b/core/fxge/fx_dib.h
index 5dcfac4962..0878dfd7fd 100644
--- a/core/fxge/fx_dib.h
+++ b/core/fxge/fx_dib.h
@@ -99,11 +99,11 @@ std::pair<int, FX_COLORREF> ArgbToAlphaAndColorRef(FX_ARGB argb);
// 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);