commit e7ab2cb57bc8433816255c404e8bfd5d6c1543b9
author Lei Zhang <thestig@chromium.org> Thu Jun 20 02:39:04 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Jun 20 02:39:04 2019 +0000
tree e56c320be2107da1d5f4f969d18d86c3b950894f
parent 99cfd6bbb447e1143c2717cb274a07141400c7c5

Assert CFX_SkiaDeviceDriver::DrawPath() has a valid |fill_mode|.

Match the assertion in CFX_AggDeviceDriver::DrawPath().

Change-Id: I00e5989626c032d99b07f0843240170d39e2e3df
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/56290
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Lei Zhang <thestig@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 dfdaff6..c5b7ca0 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -285,8 +285,11 @@
 }
 #endif  // _SKIA_SUPPORT_
 
+constexpr int kAlternateOrWindingFillModeMask =
+    FXFILL_ALTERNATE | FXFILL_WINDING;
+
 int GetAlternateOrWindingFillMode(int fill_mode) {
-  return fill_mode & (FXFILL_ALTERNATE | FXFILL_WINDING);
+  return fill_mode & kAlternateOrWindingFillModeMask;
 }
 
 bool IsAlternateFillMode(int fill_mode) {
@@ -1924,6 +1927,9 @@
     uint32_t stroke_color,                  // stroke color
     int fill_mode,  // fill mode, WINDING or ALTERNATE. 0 for not filled
     BlendMode blend_type) {
+  ASSERT(GetAlternateOrWindingFillMode(fill_mode) !=
+         kAlternateOrWindingFillModeMask);
+
   if (fill_mode & FX_ZEROAREA_FILL)
     return true;
   if (m_pCache->DrawPath(pPathData, pObject2Device, pGraphState, fill_color,