Use SkXfermode::Mode in code related to Image.

Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 167 matching lines @@
     }
 
     if (!intrinsicSize.isEmpty())
         return expandedIntSize(intrinsicSize);
 
     // As last resort, use CSS replaced element fallback size.
     return IntSize(300, 150);
 }
 
 void SVGImage::drawForContainer(GraphicsContext* context, const FloatSize containerSize, float zoom, const FloatRect& dstRect,
-    const FloatRect& srcRect, CompositeOperator compositeOp, blink::WebBlendMode blendMode)
+    const FloatRect& srcRect, SkXfermode::Mode compositeOp)
 {
     if (!m_page)
         return;
 
     // Temporarily disable the image observer to prevent changeInRect() calls due re-laying out the image.
     ImageObserverDisabler imageObserverDisabler(this);
 
     IntSize roundedContainerSize = roundedIntSize(containerSize);
     setContainerSize(roundedContainerSize);
 
     FloatRect scaledSrc = srcRect;
     scaledSrc.scale(1 / zoom);
 
     // Compensate for the container size rounding by adjusting the source rect.
     FloatSize adjustedSrcSize = scaledSrc.size();
     adjustedSrcSize.scale(roundedContainerSize.width() / containerSize.width(), roundedContainerSize.height() / containerSize.height());
     scaledSrc.setSize(adjustedSrcSize);
 
-    draw(context, dstRect, scaledSrc, compositeOp, blendMode, DoNotRespectImageOrientation);
+    draw(context, dstRect, scaledSrc, compositeOp, DoNotRespectImageOrientation);
 }
 
 PassRefPtr<NativeImageSkia> SVGImage::nativeImageForCurrentFrame()
 {
     if (!m_page)
         return nullptr;
 
     OwnPtr<ImageBuffer> buffer = ImageBuffer::create(size());
     if (!buffer)
         return nullptr;
 
-    drawForContainer(buffer->context(), size(), 1, rect(), rect(), CompositeSourceOver, blink::WebBlendModeNormal);
+    drawForContainer(buffer->context(), size(), 1, rect(), rect(), SkXfermode::kSrcOver_Mode);
 
     return NativeImageSkia::create(buffer->bitmap());
 }
 
 void SVGImage::drawPatternForContainer(GraphicsContext* context, const FloatSize containerSize,
     float zoom, const FloatRect& srcRect, const FloatSize& tileScale, const FloatPoint& phase,
-    CompositeOperator compositeOp, const FloatRect& dstRect, blink::WebBlendMode blendMode,
+    SkXfermode::Mode compositeOp, const FloatRect& dstRect,
     const IntSize& repeatSpacing)
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
 
     // Expand the tile to account for repeat spacing.
     FloatRect spacedTile(tile);
     spacedTile.expand(repeatSpacing);
 
     OwnPtr<DisplayItemList> displayItemList;
     if (RuntimeEnabledFeatures::slimmingPaintEnabled())
         displayItemList = DisplayItemList::create();
 
     // Record using a dedicated GC, to avoid inheriting unwanted state (pending color filters
     // for example must be applied atomically during the final fill/composite phase).
     GraphicsContext recordingContext(nullptr, displayItemList.get());
     recordingContext.beginRecording(spacedTile);
 
     {
         // When generating an expanded tile, make sure we don't draw into the spacing area.
         OwnPtr<FloatClipRecorder> clipRecorder;
         if (tile != spacedTile)
             clipRecorder = adoptPtr(new FloatClipRecorder(recordingContext, displayItemClient(), PaintPhaseForeground, tile));
-        drawForContainer(&recordingContext, containerSize, zoom, tile, srcRect, CompositeSourceOver, blink::WebBlendModeNormal);
+        drawForContainer(&recordingContext, containerSize, zoom, tile, srcRect, SkXfermode::kSrcOver_Mode);
     }
 
     if (displayItemList)
         displayItemList->replay(&recordingContext);
 
     RefPtr<const SkPicture> tilePicture = recordingContext.endRecording();
 
     SkMatrix patternTransform;
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
     RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(
         tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
         &patternTransform, nullptr));
 
     SkPaint paint;
     paint.setShader(patternShader.get());
-    paint.setXfermodeMode(WebCoreCompositeToSkiaComposite(compositeOp, blendMode));
+    paint.setXfermodeMode(compositeOp);
     paint.setColorFilter(context->colorFilter());
     context->drawRect(dstRect, paint);
 }
 
-void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator compositeOp, blink::WebBlendMode blendMode, RespectImageOrientationEnum)
+void SVGImage::draw(GraphicsContext* context, const FloatRect& dstRect, const FloatRect& srcRect, SkXfermode::Mode compositeOp, RespectImageOrientationEnum)
 {
     if (!m_page)
         return;
 
     float opacity = context->getNormalizedAlpha() / 255.f;
 
     OwnPtr<DisplayItemList> displayItemList;
     if (RuntimeEnabledFeatures::slimmingPaintEnabled())
         displayItemList = DisplayItemList::create();
     GraphicsContext recordingContext(nullptr, displayItemList.get());
     recordingContext.beginRecording(dstRect);
 
     {
         ClipRecorder clipRecorder(displayItemClient(), &recordingContext, DisplayItem::ClipNodeImage, enclosingIntRect(dstRect));
 
-        bool hasCompositing = compositeOp != CompositeSourceOver || blendMode != blink::WebBlendModeNormal;
+        bool hasCompositing = compositeOp != SkXfermode::kSrcOver_Mode;
         OwnPtr<CompositingRecorder> compositingRecorder;
         if (hasCompositing || opacity < 1) {
-            CompositeOperator postCompositeOp = hasCompositing ? CompositeSourceOver : compositeOp;
-            compositingRecorder = adoptPtr(new CompositingRecorder(&recordingContext, displayItemClient(), compositeOp, blendMode, opacity, postCompositeOp));
+            SkXfermode::Mode postCompositeOp = hasCompositing ? SkXfermode::kSrcOver_Mode : compositeOp;
+            compositingRecorder = adoptPtr(new CompositingRecorder(&recordingContext, displayItemClient(), compositeOperatorFromSkia(compositeOp), blendModeFromSkia(compositeOp), opacity, compositeOperatorFromSkia(postCompositeOp)));
         }
 
         // We can only draw the entire frame, clipped to the rect we want. So compute where the top left
         // of the image would be if we were drawing without clipping, and translate accordingly.
         FloatSize scale(dstRect.width() / srcRect.width(), dstRect.height() / srcRect.height());
         FloatSize topLeftOffset(srcRect.location().x() * scale.width(), srcRect.location().y() * scale.height());
         FloatPoint destOffset = dstRect.location() - topLeftOffset;
         AffineTransform transform = AffineTransform::translation(destOffset.x(), destOffset.y());
         transform.scale(scale.width(), scale.height());
         TransformRecorder transformRecorder(recordingContext, displayItemClient(), transform);
@@ skipping 155 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }