Source/platform/graphics/Image.cpp - Issue 840733004: Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/platform/graphics/Image.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

« Source/platform/graphics/GraphicsContext.h ('K') | « Source/platform/graphics/GraphicsContextTest.cpp ('k') | Source/platform/graphics/paint/CompositingDisplayItem.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/graphics/Image.cpp

diff --git a/Source/platform/graphics/Image.cpp b/Source/platform/graphics/Image.cpp

index 861c05588c341aca7496cf696ad20a2956f69a91..ea9c40970f0876701d87bd95ecc1c69421e2a84a 100644

--- a/Source/platform/graphics/Image.cpp

+++ b/Source/platform/graphics/Image.cpp

@@ -97,10 +97,10 @@ void Image::fillWithSolidColor(GraphicsContext* ctxt, const FloatRect& dstRect,

if (!color.alpha())

return;

- CompositeOperator previousOperator = ctxt->compositeOperation();

- ctxt->setCompositeOperation(!color.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op);

+ SkXfermode::Mode previousOperation = ctxt->compositeOperation();

+ ctxt->setCompositeOperation(!color.hasAlpha() && op == CompositeSourceOver ? SkXfermode::kSrc_Mode : WebCoreCompositeToSkiaComposite(op));

ctxt->fillRect(dstRect, color);

- ctxt->setCompositeOperation(previousOperator);

+ ctxt->setCompositeOperation(previousOperation);

}

FloatRect Image::adjustForNegativeSize(const FloatRect& rect)