diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-29 18:45:39 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-29 18:45:39 +0000 |
| commit | 162a31a6af1538acf7ac9835111626161287d742 (patch) | |
| tree | 7235629237d6ff187e68a116604acd83c6700b1a /xfa | |
| parent | ac8357b3ec7e1fe4000ebcae5ce65a38bfeb5cb1 (diff) | |
| download | pdfium-162a31a6af1538acf7ac9835111626161287d742.tar.xz | |
Get rid of FXARGB_MAKE macro.
ArgbEncode() does the same thing.
Change-Id: Ibb05ed4aae720c0a5ba66771699c0d7e11230921
Reviewed-on: https://pdfium-review.googlesource.com/32230
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fxfa/cxfa_ffpushbutton.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxgraphics/cxfa_geshading.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index a40b1ef1f1..648a2298a3 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -217,7 +217,7 @@ void CXFA_FFPushButton::OnDrawWidget(CXFA_Graphics* pGraphics, rtFill.Deflate(fLineWith, fLineWith); CXFA_GEPath path; path.AddRectangle(rtFill.left, rtFill.top, rtFill.width, rtFill.height); - pGraphics->SetFillColor(CXFA_GEColor(FXARGB_MAKE(128, 128, 255, 255))); + pGraphics->SetFillColor(CXFA_GEColor(ArgbEncode(128, 128, 255, 255))); pGraphics->FillPath(&path, FXFILL_WINDING, &matrix); } return; @@ -227,7 +227,7 @@ void CXFA_FFPushButton::OnDrawWidget(CXFA_Graphics* pGraphics, if ((m_pNormalWidget->GetStates() & FWL_STATE_PSB_Pressed) && (m_pNormalWidget->GetStates() & FWL_STATE_PSB_Hovered)) { float fLineWidth = GetLineWidth(); - pGraphics->SetStrokeColor(CXFA_GEColor(FXARGB_MAKE(255, 128, 255, 255))); + pGraphics->SetStrokeColor(CXFA_GEColor(ArgbEncode(255, 128, 255, 255))); pGraphics->SetLineWidth(fLineWidth); CXFA_GEPath path; diff --git a/xfa/fxgraphics/cxfa_geshading.cpp b/xfa/fxgraphics/cxfa_geshading.cpp index f6911696a1..d1bec708b9 100644 --- a/xfa/fxgraphics/cxfa_geshading.cpp +++ b/xfa/fxgraphics/cxfa_geshading.cpp @@ -73,6 +73,6 @@ void CXFA_GEShading::InitArgbArray() { // TODO(dsinclair): Add overloads for FX_ARGB. pdfium:437 m_argbArray[i] = - FXARGB_TODIB(FXARGB_MAKE(a1 + a3, r1 + r3, g1 + g3, b1 + b3)); + FXARGB_TODIB(ArgbEncode(a1 + a3, r1 + r3, g1 + g3, b1 + b3)); } } |