<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169529] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169529">169529</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-06-02 07:23:52 -0700 (Mon, 02 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Provide better encapsulation for image related painting properties.
https://bugs.webkit.org/show_bug.cgi?id=133434
Reviewed by Darin Adler.
Image related drawing property list keeps growing for the functions below and results in
multiple overloadings with seemingly random default parameters.
GraphicsContext::drawImage()
GraphicsContext::drawTiledImage()
GraphicsContext::drawImageBuffer()
This patch provides encapsulation for the image drawing properties. Encapsulation ensures that
introducing a new property does not result in yet another overloaded function.
No change in functionality.
* WebCore.exp.in:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::paint):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawImage):
(WebCore::CanvasRenderingContext2D::compositeBuffer):
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::drawImage):
(WebCore::GraphicsContext::drawTiledImage):
(WebCore::GraphicsContext::drawImageBuffer):
* platform/graphics/GraphicsContext.h:
(WebCore::ImagePaintingContext::ImagePaintingContext):
* platform/graphics/ShadowBlur.cpp:
(WebCore::ShadowBlur::endShadowLayer):
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::draw):
* platform/graphics/filters/FEComposite.cpp:
(WebCore::FEComposite::platformApplySoftware):
* rendering/FilterEffectRenderer.cpp:
(WebCore::FilterEffectRendererHelper::applyFilterEffect):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::paintSnapshotImage):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::paintReplaced):
(WebCore::RenderImage::paintIntoRect):
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::paintSnapshot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCanvasElementcpp">trunk/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFECompositecpp">trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRenderercpp">trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/ChangeLog 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2014-06-02 Zalan Bujtas <zalan@apple.com>
+
+ Provide better encapsulation for image related painting properties.
+ https://bugs.webkit.org/show_bug.cgi?id=133434
+
+ Reviewed by Darin Adler.
+
+ Image related drawing property list keeps growing for the functions below and results in
+ multiple overloadings with seemingly random default parameters.
+
+ GraphicsContext::drawImage()
+ GraphicsContext::drawTiledImage()
+ GraphicsContext::drawImageBuffer()
+
+ This patch provides encapsulation for the image drawing properties. Encapsulation ensures that
+ introducing a new property does not result in yet another overloaded function.
+
+ No change in functionality.
+
+ * WebCore.exp.in:
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::paint):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawImage):
+ (WebCore::CanvasRenderingContext2D::compositeBuffer):
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::drawImage):
+ (WebCore::GraphicsContext::drawTiledImage):
+ (WebCore::GraphicsContext::drawImageBuffer):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::ImagePaintingContext::ImagePaintingContext):
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ShadowBlur::endShadowLayer):
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBuffer::draw):
+ * platform/graphics/filters/FEComposite.cpp:
+ (WebCore::FEComposite::platformApplySoftware):
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::FilterEffectRendererHelper::applyFilterEffect):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::paintSnapshotImage):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::paintReplaced):
+ (WebCore::RenderImage::paintIntoRect):
+ * rendering/RenderSnapshottedPlugIn.cpp:
+ (WebCore::RenderSnapshottedPlugIn::paintSnapshot):
+
</ins><span class="cx"> 2014-06-02 Kiran <kiran.guduru@samsung.com>
</span><span class="cx">
</span><span class="cx"> Add mock DTMFSender support.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectERKNS_5ColorENS_10ColorSpaceE
</span><span class="cx"> __ZN7WebCore15GraphicsContext9clearRectERKNS_9FloatRectE
</span><del>-__ZN7WebCore15GraphicsContext9drawImageEPNS_5ImageENS_10ColorSpaceERKNS_10FloatPointENS_17CompositeOperatorENS_27ImageOrientationDescriptionE
</del><ins>+__ZN7WebCore15GraphicsContext9drawImageEPNS_5ImageENS_10ColorSpaceERKNS_10FloatPointERKNS_20ImagePaintingContextE
</ins><span class="cx"> __ZN7WebCore15GraphicsContext9setShadowERKNS_9FloatSizeEfRKNS_5ColorENS_10ColorSpaceE
</span><span class="cx"> __ZN7WebCore15GraphicsContext9translateEff
</span><span class="cx"> __ZN7WebCore15GraphicsContextD1Ev
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -403,9 +403,9 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(renderer()->style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, orientationDescription, useLowQualityScale);
</del><ins>+ context->drawImage(m_presentedImage.get(), ColorSpaceDeviceRGB, pixelSnappedIntRect(r), ImagePaintingContext(orientationDescription, useLowQualityScale));
</ins><span class="cx"> } else
</span><del>- context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, pixelSnappedIntRect(r), CompositeSourceOver, BlendModeNormal, useLowQualityScale);
</del><ins>+ context->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, pixelSnappedIntRect(r), useLowQualityScale);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -1378,17 +1378,17 @@
</span><span class="cx"> checkOrigin(image);
</span><span class="cx">
</span><span class="cx"> if (rectContainsCanvas(normalizedDstRect)) {
</span><del>- c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
</del><ins>+ c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingContext(op, blendMode));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (isFullCanvasCompositeMode(op)) {
</span><span class="cx"> fullCanvasCompositedDrawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op);
</span><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (op == CompositeCopy) {
</span><span class="cx"> clearCanvas();
</span><del>- c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
</del><ins>+ c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingContext(op, blendMode));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else {
</span><del>- c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op, blendMode);
</del><ins>+ c->drawImage(cachedImage->imageForRenderer(image->renderer()), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, ImagePaintingContext(op, blendMode));
</ins><span class="cx"> didDraw(normalizedDstRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1461,17 +1461,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (rectContainsCanvas(dstRect)) {
</span><del>- c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
</del><ins>+ c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingContext(state().m_globalComposite, state().m_globalBlend));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (isFullCanvasCompositeMode(state().m_globalComposite)) {
</span><span class="cx"> fullCanvasCompositedDrawImage(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite);
</span><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else if (state().m_globalComposite == CompositeCopy) {
</span><span class="cx"> clearCanvas();
</span><del>- c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
</del><ins>+ c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingContext(state().m_globalComposite, state().m_globalBlend));
</ins><span class="cx"> didDrawEntireCanvas();
</span><span class="cx"> } else {
</span><del>- c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite, state().m_globalBlend);
</del><ins>+ c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, ImagePaintingContext(state().m_globalComposite, state().m_globalBlend));
</ins><span class="cx"> didDraw(dstRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1652,7 +1652,6 @@
</span><span class="cx"> c->clipOut(bufferRect);
</span><span class="cx"> c->clearRect(canvasRect);
</span><span class="cx"> c->restore();
</span><del>-
</del><span class="cx"> c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, bufferRect.location(), state().m_globalComposite);
</span><span class="cx"> c->restore();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -570,87 +570,75 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatPoint& p, CompositeOperator op, ImageOrientationDescription description)
</del><ins>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatPoint& destination, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><del>- drawImage(image, styleColorSpace, FloatRect(p, image->size()), FloatRect(FloatPoint(), image->size()), op, BlendModeNormal, description);
</del><ins>+ drawImage(image, styleColorSpace, FloatRect(destination, image->size()), FloatRect(FloatPoint(), image->size()), imagePaintingContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& r, CompositeOperator op, ImageOrientationDescription description, bool useLowQualityScale)
</del><ins>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& destination, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><del>- drawImage(image, styleColorSpace, r, FloatRect(FloatPoint(), image->size()), op, BlendModeNormal, description, useLowQualityScale);
</del><ins>+ drawImage(image, styleColorSpace, destination, FloatRect(FloatPoint(), image->size()), imagePaintingContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatPoint& dest, const FloatRect& srcRect, CompositeOperator op, ImageOrientationDescription description)
</del><ins>+void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><del>- drawImage(image, styleColorSpace, FloatRect(dest, srcRect.size()), srcRect, op, BlendModeNormal, description);
-}
-
-void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, BlendMode blendMode, ImageOrientationDescription description, bool useLowQualityScale)
-{
- if (paintingDisabled() || !image)
- return;
-
</del><span class="cx"> // FIXME (49002): Should be InterpolationLow
</span><del>- InterpolationQualityMaintainer interpolationQualityForThisScope(*this, useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
- image->draw(this, dest, src, styleColorSpace, op, blendMode, description);
</del><ins>+ InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingContext.m_useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
+ image->draw(this, destination, source, styleColorSpace, imagePaintingContext.m_compositeOperator, imagePaintingContext.m_blendMode, imagePaintingContext.m_orientationDescription);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawTiledImage(Image* image, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& tileSize, CompositeOperator op, bool useLowQualityScale, BlendMode blendMode)
</del><ins>+void GraphicsContext::drawTiledImage(Image* image, ColorSpace colorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize,
+ const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled() || !image)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- InterpolationQualityMaintainer interpolationQualityForThisScope(*this, useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
- image->drawTiled(this, destRect, srcPoint, tileSize, styleColorSpace, op, blendMode);
</del><ins>+ InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingContext.m_useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
+ image->drawTiled(this, destination, source, tileSize, colorSpace, imagePaintingContext.m_compositeOperator, imagePaintingContext.m_blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawTiledImage(Image* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& srcRect,
- const FloatSize& tileScaleFactor, Image::TileRule hRule, Image::TileRule vRule, CompositeOperator op, bool useLowQualityScale)
</del><ins>+void GraphicsContext::drawTiledImage(Image* image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
+ Image::TileRule hRule, Image::TileRule vRule, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled() || !image)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (hRule == Image::StretchTile && vRule == Image::StretchTile) {
</span><span class="cx"> // Just do a scale.
</span><del>- drawImage(image, styleColorSpace, dest, srcRect, op);
</del><ins>+ drawImage(image, colorSpace, destination, source, imagePaintingContext);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InterpolationQualityMaintainer interpolationQualityForThisScope(*this, useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
- image->drawTiled(this, dest, srcRect, tileScaleFactor, hRule, vRule, styleColorSpace, op);
</del><ins>+ InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingContext.m_useLowQualityScale ? InterpolationLow : imageInterpolationQuality());
+ image->drawTiled(this, destination, source, tileScaleFactor, hRule, vRule, colorSpace, imagePaintingContext.m_compositeOperator);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatPoint& p, CompositeOperator op, BlendMode blendMode)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace colorSpace, const FloatPoint& destination, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><del>- drawImageBuffer(image, styleColorSpace, FloatRect(p, image->logicalSize()), FloatRect(FloatPoint(), image->logicalSize()), op, blendMode);
</del><ins>+ drawImageBuffer(image, colorSpace, FloatRect(destination, image->logicalSize()), FloatRect(FloatPoint(), image->logicalSize()), imagePaintingContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatRect& dest, CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace colorSpace, const FloatRect& destination, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><del>- drawImageBuffer(image, styleColorSpace, dest, FloatRect(FloatPoint(), FloatSize(image->logicalSize())), op, blendMode, useLowQualityScale);
</del><ins>+ drawImageBuffer(image, colorSpace, destination, FloatRect(FloatPoint(), FloatSize(image->logicalSize())), imagePaintingContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatPoint& dest, const FloatRect& srcRect, CompositeOperator op, BlendMode blendMode)
</del><ins>+void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace colorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingContext& imagePaintingContext)
</ins><span class="cx"> {
</span><del>- drawImageBuffer(image, styleColorSpace, FloatRect(dest, srcRect.size()), srcRect, op, blendMode);
-}
-
-void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorSpace, const FloatRect& dest, const FloatRect& src, CompositeOperator op, BlendMode blendMode, bool useLowQualityScale)
-{
</del><span class="cx"> if (paintingDisabled() || !image)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME (49002): Should be InterpolationLow
</span><del>- InterpolationQualityMaintainer interpolationQualityForThisScope(*this, useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
- image->draw(this, styleColorSpace, dest, src, op, blendMode, useLowQualityScale);
</del><ins>+ InterpolationQualityMaintainer interpolationQualityForThisScope(*this, imagePaintingContext.m_useLowQualityScale ? InterpolationNone : imageInterpolationQuality());
+ image->draw(this, colorSpace, destination, source, imagePaintingContext.m_compositeOperator, imagePaintingContext.m_blendMode, imagePaintingContext.m_useLowQualityScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::clip(const IntRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -193,6 +193,37 @@
</span><span class="cx"> void setStrokeAndFillColor(PlatformGraphicsContext*, CGColorRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ struct ImagePaintingContext {
+ ImagePaintingContext(CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false)
+ : m_compositeOperator(compositeOperator)
+ , m_blendMode(blendMode)
+ , m_orientationDescription(orientationDescription)
+ , m_useLowQualityScale(useLowQualityScale)
+ {
+ }
+
+ ImagePaintingContext(ImageOrientationDescription orientationDescription, bool useLowQualityScale = false, CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal)
+ : m_compositeOperator(compositeOperator)
+ , m_blendMode(blendMode)
+ , m_orientationDescription(orientationDescription)
+ , m_useLowQualityScale(useLowQualityScale)
+ {
+ }
+
+ ImagePaintingContext(bool useLowQualityScale, ImageOrientationDescription orientationDescription = ImageOrientationDescription(), CompositeOperator compositeOperator = CompositeSourceOver, BlendMode blendMode = BlendModeNormal)
+ : m_compositeOperator(compositeOperator)
+ , m_blendMode(blendMode)
+ , m_orientationDescription(orientationDescription)
+ , m_useLowQualityScale(useLowQualityScale)
+ {
+ }
+
+ CompositeOperator m_compositeOperator;
+ BlendMode m_blendMode;
+ ImageOrientationDescription m_orientationDescription;
+ bool m_useLowQualityScale;
+ };
+
</ins><span class="cx"> class GraphicsContext {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GraphicsContext); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -302,22 +333,19 @@
</span><span class="cx">
</span><span class="cx"> void strokeRect(const FloatRect&, float lineWidth);
</span><span class="cx">
</span><del>- void drawImage(Image*, ColorSpace styleColorSpace, const FloatPoint&, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription());
- void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect&, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false);
- void drawImage(Image*, ColorSpace styleColorSpace, const FloatPoint& destPoint, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, ImageOrientationDescription = ImageOrientationDescription());
- void drawImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, ImageOrientationDescription = ImageOrientationDescription(), bool useLowQualityScale = false);
-
- void drawTiledImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
- CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false, BlendMode = BlendModeNormal);
- void drawTiledImage(Image*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect,
- const FloatSize& tileScaleFactor, Image::TileRule hRule = Image::StretchTile, Image::TileRule vRule = Image::StretchTile,
- CompositeOperator = CompositeSourceOver, bool useLowQualityScale = false);
</del><ins>+ void drawImage(Image*, ColorSpace, const FloatPoint& destination, const ImagePaintingContext& = ImagePaintingContext());
+ void drawImage(Image*, ColorSpace, const FloatRect& destination, const ImagePaintingContext& = ImagePaintingContext());
+ void drawImage(Image*, ColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingContext& = ImagePaintingContext());
</ins><span class="cx">
</span><del>- void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatPoint&, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal);
- void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatRect&, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
- void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatPoint& destPoint, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal);
- void drawImageBuffer(ImageBuffer*, ColorSpace styleColorSpace, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, BlendMode = BlendModeNormal, bool useLowQualityScale = false);
</del><ins>+ void drawTiledImage(Image*, ColorSpace, const FloatRect& destination, const FloatPoint& source, const FloatSize& tileSize,
+ const ImagePaintingContext& = ImagePaintingContext());
+ void drawTiledImage(Image*, ColorSpace, const FloatRect& destination, const FloatRect& source, const FloatSize& tileScaleFactor,
+ Image::TileRule, Image::TileRule, const ImagePaintingContext& = ImagePaintingContext());
</ins><span class="cx">
</span><ins>+ void drawImageBuffer(ImageBuffer*, ColorSpace, const FloatPoint& destination, const ImagePaintingContext& = ImagePaintingContext());
+ void drawImageBuffer(ImageBuffer*, ColorSpace, const FloatRect& destination, const ImagePaintingContext& = ImagePaintingContext());
+ void drawImageBuffer(ImageBuffer*, ColorSpace, const FloatRect& destination, const FloatRect& source, const ImagePaintingContext& = ImagePaintingContext());
+
</ins><span class="cx"> void setImageInterpolationQuality(InterpolationQuality);
</span><span class="cx"> InterpolationQuality imageInterpolationQuality() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSave(*context);
</span><span class="cx">
</span><span class="cx"> context->clearShadow();
</span><del>- context->drawImageBuffer(m_layerImage, ColorSpaceDeviceRGB, roundedIntPoint(m_layerOrigin), IntRect(0, 0, m_layerSize.width(), m_layerSize.height()), context->compositeOperation());
</del><ins>+ context->drawImageBuffer(m_layerImage, ColorSpaceDeviceRGB, FloatRect(roundedIntPoint(m_layerOrigin), m_layerSize), FloatRect(FloatPoint(), m_layerSize), context->compositeOperation());
</ins><span class="cx">
</span><span class="cx"> m_layerImage = 0;
</span><span class="cx"> ScratchBuffer::shared().scheduleScratchBufferPurge();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> {
</span><span class="cx"> BackingStoreCopy copyMode = destinationContext == context() ? CopyBackingStore : DontCopyBackingStore;
</span><span class="cx"> RefPtr<Image> image = copyImage(copyMode);
</span><del>- destinationContext->drawImage(image.get(), styleColorSpace, destRect, srcRect, op, blendMode, ImageOrientationDescription(), useLowQualityScale);
</del><ins>+ destinationContext->drawImage(image.get(), styleColorSpace, destRect, srcRect, ImagePaintingContext(op, blendMode, ImageOrientationDescription(), useLowQualityScale));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFECompositecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -297,8 +297,8 @@
</span><span class="cx"> destinationRect.y() - in->absolutePaintRect().y()), destinationRect.size());
</span><span class="cx"> IntRect source2Rect(IntPoint(destinationRect.x() - in2->absolutePaintRect().x(),
</span><span class="cx"> destinationRect.y() - in2->absolutePaintRect().y()), destinationRect.size());
</span><del>- filterContext->drawImageBuffer(imageBuffer2, ColorSpaceDeviceRGB, destinationPoint, source2Rect);
- filterContext->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, destinationPoint, sourceRect, CompositeSourceIn);
</del><ins>+ filterContext->drawImageBuffer(imageBuffer2, ColorSpaceDeviceRGB, IntRect(destinationPoint, source2Rect.size()), source2Rect);
+ filterContext->drawImageBuffer(imageBuffer, ColorSpaceDeviceRGB, IntRect(destinationPoint, sourceRect.size()), sourceRect, CompositeSourceIn);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FECOMPOSITE_OPERATOR_OUT:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> destRect.move(m_paintOffset.x(), m_paintOffset.y());
</span><span class="cx">
</span><span class="cx"> destinationContext->drawImageBuffer(filter->output(), m_renderLayer->renderer().style().colorSpace(),
</span><del>- pixelSnappedForPainting(destRect, m_renderLayer->renderer().document().deviceScaleFactor()), CompositeSourceOver);
</del><ins>+ pixelSnappedForPainting(destRect, m_renderLayer->renderer().document().deviceScaleFactor()));
</ins><span class="cx">
</span><span class="cx"> filter->clearIntermediateResults();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> bool useLowQualityScaling = shouldPaintAtLowQuality(context, image.get(), bgLayer, geometry.tileSize());
</span><span class="cx"> if (image.get())
</span><span class="cx"> image->setSpaceSize(geometry.spaceSize());
</span><del>- context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(), compositeOp, useLowQualityScaling, bgLayer->blendMode());
</del><ins>+ context->drawTiledImage(image.get(), style().colorSpace(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(), ImagePaintingContext(compositeOp, bgLayer->blendMode(), ImageOrientationDescription(), useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context->drawImage(image, style().colorSpace(), alignedRect, CompositeSourceOver, orientationDescription, useLowQualityScaling);
</del><ins>+ context->drawImage(image, style().colorSpace(), alignedRect, ImagePaintingContext(orientationDescription, useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderEmbeddedObject::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context->drawImage(image.get(), style().colorSpace(), pixelSnappedForPainting(LayoutRect(paintOffset + imageOffset, imageSize), deviceScaleFactor), CompositeSourceOver, orientationDescription);
</del><ins>+ context->drawImage(image.get(), style().colorSpace(), pixelSnappedForPainting(LayoutRect(paintOffset + imageOffset, imageSize), deviceScaleFactor), orientationDescription);
</ins><span class="cx"> errorPictureDrawn = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -568,7 +568,8 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context->drawImage(imageResource().image(rect.width(), rect.height()).get(), style().colorSpace(), rect, compositeOperator, orientationDescription, useLowQualityScaling);
</del><ins>+ context->drawImage(imageResource().image(rect.width(), rect.height()).get(), style().colorSpace(), rect,
+ ImagePaintingContext(compositeOperator, BlendModeNormal, orientationDescription, useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderImage::boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance bleedAvoidance, InlineFlowBox*) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (169528 => 169529)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-06-02 10:55:37 UTC (rev 169528)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-06-02 14:23:52 UTC (rev 169529)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> #if ENABLE(CSS_IMAGE_ORIENTATION)
</span><span class="cx"> orientationDescription.setImageOrientationEnum(style().imageOrientation());
</span><span class="cx"> #endif
</span><del>- context->drawImage(image, style().colorSpace(), alignedRect, CompositeSourceOver, orientationDescription, useLowQualityScaling);
</del><ins>+ context->drawImage(image, style().colorSpace(), alignedRect, ImagePaintingContext(orientationDescription, useLowQualityScaling));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CursorDirective RenderSnapshottedPlugIn::getCursor(const LayoutPoint& point, Cursor& overrideCursor) const
</span></span></pre>
</div>
</div>
</body>
</html>