[SPv175+] Fix non-composited mask painting

For SPv175+, don't push mask transparency layer in
BoxPainter::PaintMaskImages() because the layer will be generated
by PaintChunkToCcLayer based on paint properties.

Bug: 771643
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Iadd15bd4234387fe5ecdd248e2b0ca9c5664451f
Reviewed-on: https://chromium-review.googlesource.com/803861
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521153}

third_party/WebKit/LayoutTests/TestExpectations

@@ -86,10 +86,8 @@ crbug.com/771643 virtual/spv175/compositing/opacity-with-mask.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/fixed-body-background-positioned.html [ Failure Pass ]
 crbug.com/771643 virtual/spv175/compositing/geometry/repaint-foreground-layer.html [ Crash ]
 crbug.com/771643 virtual/spv175/compositing/images/direct-image-dynamic-border-radius.html [ Failure ]
-crbug.com/771643 virtual/spv175/compositing/masks/direct-image-mask.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/masks/mask-with-added-filters.html [ Failure Pass ]
 crbug.com/771643 virtual/spv175/compositing/masks/mask-with-removed-filters.html [ Failure ]
-crbug.com/771643 virtual/spv175/compositing/masks/masked-ancestor.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/masks/multiple-masks.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/masks/simple-composited-mask.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/overflow/border-radius-on-grandparent-composited-grandchild.html [ Failure ]
@@ -115,10 +113,8 @@ crbug.com/771643 virtual/spv175/compositing/squashing/squash-overflow-hidden-scr
 crbug.com/771643 virtual/spv175/compositing/squashing/squash-with-ancestor-reflection.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/squashing/visibility-composited-squashing.html [ Failure ]
 crbug.com/771643 virtual/spv175/compositing/visibility/visibility-image-layers.html [ Failure Pass ]
-crbug.com/771643 virtual/spv175/paint/frames/iframe-with-mask.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/offset-change-wrong-invalidation-with-float.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/repaint-across-writing-mode-boundary.html [ Failure ]
-crbug.com/771643 virtual/spv175/paint/invalidation/resize-mask.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/compositing/newly-composited-repaint-rect.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/compositing/subpixel-offset-scaled-transform-composited.html [ Failure ]
@@ -145,10 +141,7 @@ crbug.com/771643 virtual/spv175/paint/invalidation/svg/resource-invalidate-on-ta
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/text-viewbox-rescale.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/use-clipped-hit.svg [ Failure ]
 crbug.com/771643 virtual/spv175/paint/invalidation/svg/zoom-coords-viewattr-01-b.svg [ Failure ]
-crbug.com/771643 virtual/spv175/paint/masks/fieldset-mask.html [ Failure ]
-crbug.com/771643 virtual/spv175/paint/masks/table-cell-masks.html [ Failure ]
 crbug.com/771643 virtual/spv175/paint/pagination/pagination-change-clip-crash.html [ Failure ]
-crbug.com/771643 virtual/spv175/paint/plugins/plugin-object-with-mask.html [ Failure ]
 
 ########## Ref tests can't be rebaselined ##########
 crbug.com/504613 crbug.com/524248 [ Mac ] paint/images/image-backgrounds-not-antialiased.html [ Failure ]

third_party/WebKit/Source/core/paint/BoxPainter.cpp

@@ -248,7 +248,8 @@ void BoxPainter::PaintMaskImages(const PaintInfo& paint_info,
 
   bool all_mask_images_loaded = true;
 
-  if (!mask_blending_applied_by_compositor) {
+  if (!mask_blending_applied_by_compositor &&
+      !RuntimeEnabledFeatures::SlimmingPaintV175Enabled()) {
     push_transparency_layer = true;
     StyleImage* mask_box_image = layout_box_.Style()->MaskBoxImage().GetImage();
     const FillLayer& mask_layers = layout_box_.Style()->MaskLayers();

third_party/WebKit/Source/platform/graphics/LoggingCanvas.cpp

@@ -482,6 +482,8 @@ std::unique_ptr<JSONObject> ObjectForSkPaint(const SkPaint& paint) {
   paint_item->SetString("textEncoding",
                         TextEncodingName(paint.getTextEncoding()));
   paint_item->SetString("hinting", HintingName(paint.getHinting()));
+  if (paint.getBlendMode() != SkBlendMode::kSrcOver)
+    paint_item->SetString("blendMode", SkBlendMode_Name(paint.getBlendMode()));
   return paint_item;
 }