diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-03-21 04:36:35 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-21 04:36:35 +0000 |
| commit | 765d1ebe41defa659a703a2f0ff5284c0da96a95 (patch) | |
| tree | adaec2bce49268f18cd51ee05120d6a05dc74b3a /core/fxge | |
| parent | da89ac4c49013ce8d2d1d81e389cd37c0ee2ef27 (diff) | |
| download | pdfium-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')
| -rw-r--r-- | core/fxge/dib/fx_dib_main.cpp | 6 | ||||
| -rw-r--r-- | core/fxge/fx_dib.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 5d7b585979..6c3a236edd 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -87,9 +87,9 @@ FX_COLORREF ArgbToColorRef(FX_ARGB argb) { 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) { 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); |