Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: Source/platform/graphics/GraphicsContext.cpp

Issue 840733004: Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/GraphicsContext.cpp
diff --git a/Source/platform/graphics/GraphicsContext.cpp b/Source/platform/graphics/GraphicsContext.cpp
index 14bfdc450b40acc67de8138fe87dca58979f65f0..c0cdd2e5cbe2a05754188d0e2e1a68b192998a53 100644
--- a/Source/platform/graphics/GraphicsContext.cpp
+++ b/Source/platform/graphics/GraphicsContext.cpp
@@ -445,13 +445,12 @@ void GraphicsContext::setCompositeOperation(SkXfermode::Mode xferMode)
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());
}
@@ -1697,10 +1696,10 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, Compos
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)

Powered by Google App Engine
This is Rietveld 408576698