Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod…

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 427 matching lines @@
     return m_isCertainlyOpaque && m_shouldSmoothFonts;
 }
 
 void GraphicsContext::setCompositeOperation(SkXfermode::Mode xferMode)
 {
     if (contextDisabled())
         return;
     mutableState()->setCompositeOperation(xferMode);
 }
 
-void GraphicsContext::setCompositeOperation(CompositeOperator compositeOperation, WebBlendMode blendMode)
+SkXfermode::Mode GraphicsContext::compositeOperation() const
 {
-    SkXfermode::Mode xferMode = WebCoreCompositeToSkiaComposite(compositeOperation, blendMode);
-    setCompositeOperation(xferMode);
+    return immutableState()->compositeOperation();
 }
 
-CompositeOperator GraphicsContext::compositeOperation() const
+CompositeOperator GraphicsContext::compositeOperator() const
 {
     return compositeOperatorFromSkia(immutableState()->compositeOperation());
 }
 
 WebBlendMode GraphicsContext::blendModeOperation() const
 {
     return blendModeFromSkia(immutableState()->compositeOperation());
 }
 
 SkColorFilter* GraphicsContext::colorFilter() const
@@ skipping 1225 matching lines @@
                            SkScalarToDouble(m.getScaleY()),
                            SkScalarToDouble(m.getTranslateX()),
                            SkScalarToDouble(m.getTranslateY()));
 }
 
 void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, CompositeOperator op)
 {
     if (contextDisabled())
         return;
 
-    CompositeOperator previousOperator = compositeOperation();
-    setCompositeOperation(op);
+    SkXfermode::Mode previousOperation = compositeOperation();
+    setCompositeOperation(WebCoreCompositeToSkiaComposite(op));
     fillRect(rect, color);
-    setCompositeOperation(previousOperator);
+    setCompositeOperation(previousOperation);
 }
 
 void GraphicsContext::fillRoundedRect(const FloatRoundedRect& rect, const Color& color)
 {
     if (contextDisabled())
         return;
 
     if (rect.isRounded())
         fillRoundedRect(rect.rect(), rect.radii().topLeft(), rect.radii().topRight(), rect.radii().bottomLeft(), rect.radii().bottomRight(), color);
     else
@@ skipping 279 matching lines @@
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterLevel(static_cast<SkPaint::FilterLevel>(resampling));
 
     return initialSaveCount;
 }
 
 } // namespace blink