commit a921cc910a1485d54a500412096177893f0bc57f
author Lei Zhang <thestig@chromium.org> Mon Oct 19 21:04:19 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Oct 19 21:04:19 2020 +0000
tree f710312d1eb93891bf0356629a7f91b493094966
parent ba5ec78225a3a0b6494ecfae68ff56b8ccdd0375

Remove CMYK support from CFX_SkiaDeviceDriver.

Whatever rudimentary support there is.

Change-Id: Ie245495a5619112ee48217d19f1acda6a852f985
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75315
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Hui Yingst <nigi@chromium.org>

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 80a03b0..64be78b 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -33,6 +33,7 @@
 #include "core/fxge/dib/cfx_imagerenderer.h"
 #include "core/fxge/dib/cfx_imagestretcher.h"
 #include "core/fxge/text_char_pos.h"
+#include "third_party/base/check.h"
 #include "third_party/base/notreached.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/span.h"
@@ -1634,6 +1635,8 @@
 #endif
       m_bRgbByteOrder(bRgbByteOrder),
       m_bGroupKnockout(bGroupKnockout) {
+  DCHECK(!m_pBitmap->IsCmykImage());
+
   SkBitmap skBitmap;
   SkColorType color_type;
   const int bpp = pBitmap->GetBPP();
@@ -1885,9 +1888,6 @@
           flags |= FXRC_BYTEMASK_OUTPUT;
         }
       }
-      if (m_pBitmap->IsCmykImage()) {
-        flags |= FXRC_CMYK_OUTPUT;
-      }
       return flags;
     }
 #endif  // defined(_SKIA_SUPPORT_PATHS_)