Make beginLayer() and CanvasRenderingContext2D use SkXfermode::Mode.

Source/platform/graphics/GraphicsContextState.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "platform/graphics/GraphicsContextState.h"
 
 #include "platform/graphics/skia/SkiaUtils.h"
 
 namespace blink {
 
 GraphicsContextState::GraphicsContextState()
     : m_strokeColor(Color::black)
     , m_fillColor(Color::black)
     , m_fillRule(RULE_NONZERO)
     , m_textDrawingMode(TextModeFill)
     , m_alpha(256)
-    , m_compositeOperator(CompositeSourceOver)
-    , m_blendMode(WebBlendModeNormal)
+    , m_compositeOperation(SkXfermode::kSrcOver_Mode)
     , m_interpolationQuality(InterpolationDefault)
     , m_saveCount(0)
     , m_shouldAntialias(true)
     , m_shouldClampToSourceRect(true)
 {
     m_strokePaint.setStyle(SkPaint::kStroke_Style);
     m_strokePaint.setStrokeWidth(SkFloatToScalar(m_strokeData.thickness()));
     m_strokePaint.setColor(applyAlpha(m_strokeColor.rgb()));
     m_strokePaint.setStrokeCap(SkPaint::kDefault_Cap);
     m_strokePaint.setStrokeJoin(SkPaint::kDefault_Join);
@@ skipping 14 matching lines @@
     , m_strokePattern(other.m_strokePattern)
     , m_fillColor(other.m_fillColor)
     , m_fillRule(other.m_fillRule)
     , m_fillGradient(other.m_fillGradient)
     , m_fillPattern(other.m_fillPattern)
     , m_looper(other.m_looper)
     , m_dropShadowImageFilter(other.m_dropShadowImageFilter)
     , m_textDrawingMode(other.m_textDrawingMode)
     , m_alpha(other.m_alpha)
     , m_colorFilter(other.m_colorFilter)
-    , m_compositeOperator(other.m_compositeOperator)
-    , m_blendMode(other.m_blendMode)
+    , m_compositeOperation(other.m_compositeOperation)
     , m_interpolationQuality(other.m_interpolationQuality)
     , m_saveCount(0)
     , m_shouldAntialias(other.m_shouldAntialias)
     , m_shouldClampToSourceRect(other.m_shouldClampToSourceRect) { }
 
 void GraphicsContextState::copy(const GraphicsContextState& source)
 {
     this->~GraphicsContextState();
     new (this) GraphicsContextState(source);
 }
@@ skipping 167 matching lines @@
     m_strokeData.setLineDash(dashes, dashOffset);
 }
 
 void GraphicsContextState::setColorFilter(PassRefPtr<SkColorFilter> colorFilter)
 {
     m_colorFilter = colorFilter;
     m_strokePaint.setColorFilter(m_colorFilter.get());
     m_fillPaint.setColorFilter(m_colorFilter.get());
 }
 
-void GraphicsContextState::setCompositeOperation(CompositeOperator compositeOperation, WebBlendMode blendMode)
+void GraphicsContextState::setCompositeOperation(SkXfermode::Mode xferMode)
 {
-    m_compositeOperator = compositeOperation;
-    m_blendMode = blendMode;
-    SkXfermode::Mode xferMode = WebCoreCompositeToSkiaComposite(compositeOperation, blendMode);
+    m_compositeOperation = xferMode;
     m_strokePaint.setXfermodeMode(xferMode);
     m_fillPaint.setXfermodeMode(xferMode);
 }
 
 void GraphicsContextState::setInterpolationQuality(InterpolationQuality quality)
 {
     m_interpolationQuality = quality;
     m_strokePaint.setFilterLevel(WebCoreInterpolationQualityToSkFilterLevel(quality));
     m_fillPaint.setFilterLevel(WebCoreInterpolationQualityToSkFilterLevel(quality));
 }
 
 void GraphicsContextState::setShouldAntialias(bool shouldAntialias)
 {
     m_shouldAntialias = shouldAntialias;
     m_strokePaint.setAntiAlias(shouldAntialias);
     m_fillPaint.setAntiAlias(shouldAntialias);
 }
 
 
 } // namespace blink