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

Unified Diff: Source/core/rendering/svg/SVGRenderingContext.cpp

Issue 840733004: Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rename compositeOperationDeprecated 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
« no previous file with comments | « Source/core/paint/ViewPainter.cpp ('k') | Source/platform/graphics/CrossfadeGeneratedImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/SVGRenderingContext.cpp
diff --git a/Source/core/rendering/svg/SVGRenderingContext.cpp b/Source/core/rendering/svg/SVGRenderingContext.cpp
index e8226dd4e5f44e6989f031806a391b8f76aef3a1..86225322a063cb8e9d13a96b7cb3203ea580e223 100644
--- a/Source/core/rendering/svg/SVGRenderingContext.cpp
+++ b/Source/core/rendering/svg/SVGRenderingContext.cpp
@@ -99,7 +99,7 @@ void SVGRenderingContext::prepareToRenderSVGContent(RenderObject* object, PaintI
return;
if (!isIsolationInstalled() && SVGRenderSupport::isIsolationRequired(m_object))
- m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo->context, m_object->displayItemClient(), m_paintInfo->context->compositeOperation(), WebBlendModeNormal, 1, m_paintInfo->context->compositeOperation()));
+ m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo->context, m_object->displayItemClient(), m_paintInfo->context->compositeOperationDeprecated(), WebBlendModeNormal, 1, m_paintInfo->context->compositeOperationDeprecated()));
m_renderingFlags |= RenderingPrepared;
}
@@ -119,7 +119,7 @@ void SVGRenderingContext::applyCompositingIfNecessary()
if (opacity < 1 || hasBlendMode) {
m_clipRecorder = adoptPtr(new FloatClipRecorder(*m_paintInfo->context, m_object->displayItemClient(), m_paintInfo->phase, m_object->paintInvalidationRectInLocalCoordinates()));
WebBlendMode blendMode = hasBlendMode ? style->blendMode() : WebBlendModeNormal;
- CompositeOperator compositeOp = hasBlendMode ? CompositeSourceOver : m_paintInfo->context->compositeOperation();
+ CompositeOperator compositeOp = hasBlendMode ? CompositeSourceOver : m_paintInfo->context->compositeOperationDeprecated();
m_compositingRecorder = adoptPtr(new CompositingRecorder(m_paintInfo->context, m_object->displayItemClient(), compositeOp, blendMode, opacity, compositeOp));
}
}
« no previous file with comments | « Source/core/paint/ViewPainter.cpp ('k') | Source/platform/graphics/CrossfadeGeneratedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698