commit d9b86b97a54399120d01d763adf46e230cebc159
author Hui Yingst <nigi@chromium.org> Wed Jun 03 20:02:47 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jun 03 20:02:47 2020 +0000
tree cd5ca001fa611c7cc914f67f0d7e8f5610889a7c
parent 25a791b9686420292c809196a8edbe7f16bb7661

Add a helper function for creating fill rendering options.

Move the process of creating fill rendering options into a helper
function GetFillRenderOptionsHelper(). This helps distinguish the
difference between fill type (can be 0, FXFILL_ALTERNATE or
FXFILL_WINDING) and other fill option flags, and makes it easier to
replace the integer that represents all fill options with a
struct/class in the future.

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

core/fpdfapi/render/cpdf_renderstatus.cpp

diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 71e9b7c..18de03f 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -116,6 +116,29 @@
   return pBitmap;
 }
 
+int GetFillRenderOptionsHelper(const CPDF_RenderOptions::Options& options,
+                               const CPDF_PathObject* path_obj,
+                               int fill_type,
+                               bool is_stroke,
+                               bool is_type3_char) {
+  int fill_options = fill_type;
+  if (fill_type && options.bRectAA)
+    fill_options |= FXFILL_RECT_AA;
+  if (options.bFillFullcover)
+    fill_options |= FXFILL_FULLCOVER;
+  if (options.bNoPathSmooth)
+    fill_options |= FXFILL_NOPATHSMOOTH;
+  if (static_cast<const CPDF_PageObject*>(path_obj)
+          ->m_GeneralState.GetStrokeAdjust())
+    fill_options |= FX_STROKE_ADJUST;
+  if (is_stroke)
+    fill_options |= FX_FILL_STROKE;
+  if (is_type3_char)
+    fill_options |= FX_FILL_TEXT_MODE;
+
+  return fill_options;
+}
+
 bool IsAvailableMatrix(const CFX_Matrix& matrix) {
   if (matrix.a == 0 || matrix.d == 0)
     return matrix.b != 0 && matrix.c != 0;
@@ -401,6 +424,7 @@
 
 bool CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj,
                                     const CFX_Matrix& mtObj2Device) {
+  // Path fill type, can be 0, FXFILL_ALTERNATE or FXFILL_WINDING.
   int FillType = pPathObj->filltype();
   bool bStroke = pPathObj->stroke();
   ProcessPathPattern(pPathObj, mtObj2Device, &FillType, &bStroke);
@@ -409,8 +433,9 @@
 
   // If the option to convert fill paths to stroke is enabled for forced color,
   // set |FillType| to 0 and |bStroke| to true.
+  CPDF_RenderOptions::Options& options = m_Options.GetOptions();
   if (m_Options.ColorModeIs(CPDF_RenderOptions::Type::kForcedColor) &&
-      m_Options.GetOptions().bConvertFillToStroke && (FillType != 0)) {
+      options.bConvertFillToStroke && (FillType != 0)) {
     bStroke = true;
     FillType = 0;
   }
@@ -421,28 +446,14 @@
   if (!IsAvailableMatrix(path_matrix))
     return true;
 
-  if (FillType && m_Options.GetOptions().bRectAA)
-    FillType |= FXFILL_RECT_AA;
-  if (m_Options.GetOptions().bFillFullcover)
-    FillType |= FXFILL_FULLCOVER;
-  if (m_Options.GetOptions().bNoPathSmooth)
-    FillType |= FXFILL_NOPATHSMOOTH;
-  if (bStroke)
-    FillType |= FX_FILL_STROKE;
-
-  const CPDF_PageObject* pPageObj =
-      static_cast<const CPDF_PageObject*>(pPathObj);
-  if (pPageObj->m_GeneralState.GetStrokeAdjust())
-    FillType |= FX_STROKE_ADJUST;
-  if (m_pType3Char)
-    FillType |= FX_FILL_TEXT_MODE;
-
+  int fill_options = GetFillRenderOptionsHelper(options, pPathObj, FillType,
+                                                bStroke, m_pType3Char);
   CFX_GraphState graphState = pPathObj->m_GraphState;
   if (m_Options.GetOptions().bThinLine)
     graphState.SetLineWidth(0);
   return m_pDevice->DrawPathWithBlend(
       pPathObj->path().GetObject(), &path_matrix, graphState.GetObject(),
-      fill_argb, stroke_argb, FillType, m_curBlend);
+      fill_argb, stroke_argb, fill_options, m_curBlend);
 }
 
 RetainPtr<CPDF_TransferFunc> CPDF_RenderStatus::GetTransferFunc(