Merge pull request #11283 from Snuffleupagus/hasBlendModes-Array

Ensure that `PartialEvaluator.hasBlendModes` handles Blend Modes in Arrays (PR 11281 follow-up)
mozilla · Oct 28, 2019 · 16fb543 · 16fb543
2 parents 3173756 + 0496ea6
commit 16fb543
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -230,9 +230,20 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
             if (graphicState.objId) {
               processed[graphicState.objId] = true;
             }
-            var bm = graphicState.get('BM');
-            if ((bm instanceof Name) && bm.name !== 'Normal') {
-              return true;
+
+            const bm = graphicState.get('BM');
+            if (bm instanceof Name) {
+              if (bm.name !== 'Normal') {
+                return true;
+              }
+              continue;
+            }
+            if (bm !== undefined && Array.isArray(bm)) {
+              for (let j = 0, jj = bm.length; j < jj; j++) {
+                if ((bm[j] instanceof Name) && bm[j].name !== 'Normal') {
+                  return true;
+                }
+              }
             }
           }
         }