commit 391d9ae4aac28bad873cc3314bc01ab0cf0efac6
author Lei Zhang <thestig@chromium.org> Thu Feb 21 18:45:47 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 21 18:45:47 2019 +0000
tree 409ae2c204f489c523d63026651ae268d8f59d85
parent cb752f374397f22683e93746c5f646990dc99367

Remove |CFX_ImageRenderer::m_AlphaFlag|.

It is always set to 0.

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

core/fxge/dib/cfx_imagerenderer.cpp

diff --git a/core/fxge/dib/cfx_imagerenderer.cpp b/core/fxge/dib/cfx_imagerenderer.cpp
index 408bec1..8d4e04e 100644
--- a/core/fxge/dib/cfx_imagerenderer.cpp
+++ b/core/fxge/dib/cfx_imagerenderer.cpp
@@ -98,18 +98,12 @@
     return false;
 
   if (pBitmap->IsAlphaMask()) {
-    if (m_BitmapAlpha != 255) {
-      if (m_AlphaFlag >> 8) {
-        m_AlphaFlag = (((uint8_t)((m_AlphaFlag & 0xff) * m_BitmapAlpha / 255)) |
-                       ((m_AlphaFlag >> 8) << 8));
-      } else {
-        m_MaskColor = FXARGB_MUL_ALPHA(m_MaskColor, m_BitmapAlpha);
-      }
-    }
+    if (m_BitmapAlpha != 255)
+      m_MaskColor = FXARGB_MUL_ALPHA(m_MaskColor, m_BitmapAlpha);
     m_pDevice->CompositeMask(
         m_pTransformer->result().left, m_pTransformer->result().top,
         pBitmap->GetWidth(), pBitmap->GetHeight(), pBitmap, m_MaskColor, 0, 0,
-        BlendMode::kNormal, m_pClipRgn.Get(), m_bRgbByteOrder, m_AlphaFlag);
+        BlendMode::kNormal, m_pClipRgn.Get(), m_bRgbByteOrder, 0);
   } else {
     if (m_BitmapAlpha != 255)
       pBitmap->MultiplyAlpha(m_BitmapAlpha);

core/fxge/dib/cfx_imagerenderer.h

diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h
index d97c018..a64fd4a 100644
--- a/core/fxge/dib/cfx_imagerenderer.h
+++ b/core/fxge/dib/cfx_imagerenderer.h
@@ -44,7 +44,6 @@
   FX_RECT m_ClipBox;
   const int m_BitmapAlpha;
   int m_Status = 0;
-  int m_AlphaFlag = 0;
   uint32_t m_MaskColor;
   const bool m_bRgbByteOrder;
 };