<!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>[190124] trunk/Source</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/190124">190124</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 11:45:54 -0700 (Tue, 22 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
https://bugs.webkit.org/show_bug.cgi?id=149428

Reviewed by Simon Fraser and Darin Adler.

* platform/graphics/ImageBuffer.cpp:
(WebCore::ImageBuffer::createCompatibleBuffer):
* platform/graphics/ImageBuffer.h:
(WebCore::ImageBuffer::create):
Make the RenderingMode parameter to ImageBuffer::create non-optional.

* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::renderingMode):
* platform/graphics/GraphicsTypes.h:
Add renderingMode() getter so that every caller doesn't need to do the conversion to RenderingMode.

* css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::image):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::LRUImageBufferCache::imageBuffer):
* rendering/shapes/Shape.cpp:
(WebCore::Shape::createRasterShape):
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::putByteArray):
These five callers create unconditionally unaccelerated ImageBuffers which
should probably instead respect the acceleration bit from the context
that the ImageBuffer will eventually be painted into. Bugs have been filed.

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::createCompositingBuffer):
* platform/graphics/CrossfadeGeneratedImage.cpp:
(WebCore::CrossfadeGeneratedImage::drawPattern):
Adjust the argument order and remove defaults which are passed explicitly.

* page/FrameSnapshotting.cpp:
(WebCore::snapshotFrameRect):
Snapshots are (currently) meant to be taken without accelerated drawing.
Make this explicit.

* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::drawPattern):
Make use of createCompatibleBuffer. This caller was previously creating
an unconditionally unaccelerated context!

* platform/graphics/NamedImageGeneratedImage.cpp:
(WebCore::NamedImageGeneratedImage::drawPattern):
Remove a comment.

* platform/graphics/ShadowBlur.cpp:
(WebCore::ScratchBuffer::getScratchBuffer):
ShadowBlur is only used with unaccelerated contexts, so it's OK to hardcode Unaccelerated here.

* platform/graphics/filters/FilterEffect.cpp:
(WebCore::FilterEffect::asImageBuffer):
(WebCore::FilterEffect::createImageBufferResult):
Flip the order of the arguments.

(WebCore::FilterEffect::openCLImageToImageBuffer):
This caller was previously creating an unaccelerated buffer; instead, match the destination buffer.

* rendering/FilterEffectRenderer.cpp:
(WebCore::FilterEffectRenderer::allocateBackingStoreIfNeeded):
Adjust the argument order and remove defaults which are passed explicitly.

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
Get rid of the unneeded renderingMode local, and factor out retrieval of Frame.

* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::applyClippingToContext):
* rendering/svg/RenderSVGResourceMasker.cpp:
(WebCore::RenderSVGResourceMasker::applyResource):
These two callers are unconditionally creating unaccelerated buffers,
and changing this to match the destination context seems to actually
break things. This needs further investigation.

* rendering/svg/RenderSVGResourceGradient.cpp:
(WebCore::createMaskAndSwapContextForTextGradient):
This caller was previously creating an unaccelerated buffer; instead, match the destination buffer.

* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::buildPattern):
Make use of renderingMode().

* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::createImageBuffer):
Adjust the argument order.

* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::nativeImageForCurrentFrame):

* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::imageForCurrentSharingServicePickerItem):

* Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
(WebKit::ThreadSafeCoordinatedSurface::create):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFilterImageValuecpp">trunk/Source/WebCore/css/CSSFilterImageValue.cpp</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="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameSnapshottingcpp">trunk/Source/WebCore/page/FrameSnapshotting.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsTypesh">trunk/Source/WebCore/platform/graphics/GraphicsTypes.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBuffercpp">trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageBufferh">trunk/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp">trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterEffectcpp">trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapBitmapTexturecpp">trunk/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRenderercpp">trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapecpp">trunk/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/ChangeLog        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -1,3 +1,100 @@
</span><ins>+2015-09-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
+        https://bugs.webkit.org/show_bug.cgi?id=149428
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        * platform/graphics/ImageBuffer.cpp:
+        (WebCore::ImageBuffer::createCompatibleBuffer):
+        * platform/graphics/ImageBuffer.h:
+        (WebCore::ImageBuffer::create):
+        Make the RenderingMode parameter to ImageBuffer::create non-optional.
+
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::GraphicsContext::renderingMode):
+        * platform/graphics/GraphicsTypes.h:
+        Add renderingMode() getter so that every caller doesn't need to do the conversion to RenderingMode.
+
+        * css/CSSFilterImageValue.cpp:
+        (WebCore::CSSFilterImageValue::image):
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::LRUImageBufferCache::imageBuffer):
+        * rendering/shapes/Shape.cpp:
+        (WebCore::Shape::createRasterShape):
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::createTextTrackRepresentationImage):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::putByteArray):
+        These five callers create unconditionally unaccelerated ImageBuffers which
+        should probably instead respect the acceleration bit from the context
+        that the ImageBuffer will eventually be painted into. Bugs have been filed.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::createImageBuffer):
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::createCompositingBuffer):
+        * platform/graphics/CrossfadeGeneratedImage.cpp:
+        (WebCore::CrossfadeGeneratedImage::drawPattern):
+        Adjust the argument order and remove defaults which are passed explicitly.
+
+        * page/FrameSnapshotting.cpp:
+        (WebCore::snapshotFrameRect):
+        Snapshots are (currently) meant to be taken without accelerated drawing.
+        Make this explicit.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::drawPattern):
+        Make use of createCompatibleBuffer. This caller was previously creating
+        an unconditionally unaccelerated context!
+
+        * platform/graphics/NamedImageGeneratedImage.cpp:
+        (WebCore::NamedImageGeneratedImage::drawPattern):
+        Remove a comment.
+
+        * platform/graphics/ShadowBlur.cpp:
+        (WebCore::ScratchBuffer::getScratchBuffer):
+        ShadowBlur is only used with unaccelerated contexts, so it's OK to hardcode Unaccelerated here.
+
+        * platform/graphics/filters/FilterEffect.cpp:
+        (WebCore::FilterEffect::asImageBuffer):
+        (WebCore::FilterEffect::createImageBufferResult):
+        Flip the order of the arguments.
+
+        (WebCore::FilterEffect::openCLImageToImageBuffer):
+        This caller was previously creating an unaccelerated buffer; instead, match the destination buffer.
+
+        * rendering/FilterEffectRenderer.cpp:
+        (WebCore::FilterEffectRenderer::allocateBackingStoreIfNeeded):
+        Adjust the argument order and remove defaults which are passed explicitly.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        Get rid of the unneeded renderingMode local, and factor out retrieval of Frame.
+
+        * rendering/svg/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::applyClippingToContext):
+        * rendering/svg/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::applyResource):
+        These two callers are unconditionally creating unaccelerated buffers,
+        and changing this to match the destination context seems to actually
+        break things. This needs further investigation.
+
+        * rendering/svg/RenderSVGResourceGradient.cpp:
+        (WebCore::createMaskAndSwapContextForTextGradient):
+        This caller was previously creating an unaccelerated buffer; instead, match the destination buffer.
+
+        * rendering/svg/RenderSVGResourcePattern.cpp:
+        (WebCore::RenderSVGResourcePattern::buildPattern):
+        Make use of renderingMode().
+
+        * rendering/svg/SVGRenderingContext.cpp:
+        (WebCore::SVGRenderingContext::createImageBuffer):
+        Adjust the argument order.
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::nativeImageForCurrentFrame):
+
</ins><span class="cx"> 2015-09-22  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         XMLHttpRequest properties should be on the prototype
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFilterImageValue.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFilterImageValue.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/css/CSSFilterImageValue.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -120,7 +120,8 @@
</span><span class="cx">         return Image::nullImage();
</span><span class="cx"> 
</span><span class="cx">     // Transform Image into ImageBuffer.
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; texture = ImageBuffer::create(size);
</del><ins>+    // FIXME (149424): This buffer should not be unconditionally unaccelerated.
+    std::unique_ptr&lt;ImageBuffer&gt; texture = ImageBuffer::create(size, Unaccelerated);
</ins><span class="cx">     if (!texture)
</span><span class="cx">         return Image::nullImage();
</span><span class="cx">     FloatRect imageRect = FloatRect(FloatPoint(), size);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     RenderingMode renderingMode = shouldAccelerate(bufferSize) ? Accelerated : Unaccelerated;
</span><del>-    m_imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, renderingMode);
</del><ins>+    m_imageBuffer = ImageBuffer::create(size(), renderingMode);
</ins><span class="cx">     if (!m_imageBuffer)
</span><span class="cx">         return;
</span><span class="cx">     m_imageBuffer-&gt;context().setShadowsIgnoreTransforms(true);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -1684,8 +1684,7 @@
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr&lt;ImageBuffer&gt; CanvasRenderingContext2D::createCompositingBuffer(const IntRect&amp; bufferRect)
</span><span class="cx"> {
</span><del>-    RenderingMode renderMode = isAccelerated() ? Accelerated : Unaccelerated;
-    return ImageBuffer::create(bufferRect.size(), 1, ColorSpaceDeviceRGB, renderMode);
</del><ins>+    return ImageBuffer::create(bufferRect.size(), isAccelerated() ? Accelerated : Unaccelerated);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CanvasRenderingContext2D::compositeBuffer(ImageBuffer* buffer, const IntRect&amp; bufferRect, CompositeOperator op)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -4880,7 +4880,8 @@
</span><span class="cx">         return buf;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; temp = ImageBuffer::create(size, 1);
</del><ins>+    // FIXME (149423): Should this ImageBuffer be unconditionally unaccelerated?
+    std::unique_ptr&lt;ImageBuffer&gt; temp = ImageBuffer::create(size, Unaccelerated);
</ins><span class="cx">     if (!temp)
</span><span class="cx">         return nullptr;
</span><span class="cx">     i = std::min(m_capacity - 1, i);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -1371,7 +1371,8 @@
</span><span class="cx"> 
</span><span class="cx">     IntRect paintingRect = IntRect(IntPoint(), layer-&gt;size());
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</del><ins>+    // FIXME (149422): This buffer should not be unconditionally unaccelerated.
+    std::unique_ptr&lt;ImageBuffer&gt; buffer(ImageBuffer::create(paintingRect.size(), Unaccelerated, deviceScaleFactor));
</ins><span class="cx">     if (!buffer)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameSnapshottingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameSnapshotting.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameSnapshotting.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/page/FrameSnapshotting.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">     if (frame.settings().delegatesPageScaling())
</span><span class="cx">         scaleFactor *= frame.page()-&gt;pageScaleFactor();
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(imageRect.size(), scaleFactor, ColorSpaceDeviceRGB);
</del><ins>+    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(imageRect.size(), Unaccelerated, scaleFactor);
</ins><span class="cx">     if (!buffer)
</span><span class="cx">         return nullptr;
</span><span class="cx">     buffer-&gt;context().translate(-imageRect.x(), -imageRect.y());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     if (!m_cachedImage) {
</span><del>-        std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(expandedIntSize(tileRect.size()));
</del><ins>+        std::unique_ptr&lt;ImageBuffer&gt; buffer = ctxt.createCompatibleBuffer(expandedIntSize(tileRect.size()));
</ins><span class="cx">         if (!buffer)
</span><span class="cx">             return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CrossfadeGeneratedImage::drawPattern(GraphicsContext&amp; context, const FloatRect&amp; srcRect, const AffineTransform&amp; patternTransform, const FloatPoint&amp; phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect&amp; dstRect, BlendMode blendMode)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context.isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><ins>+    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(size(), context.renderingMode());
</ins><span class="cx">     if (!imageBuffer)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include &quot;FloatRect.h&quot;
</span><span class="cx"> #include &quot;FontCascade.h&quot;
</span><span class="cx"> #include &quot;Gradient.h&quot;
</span><ins>+#include &quot;GraphicsTypes.h&quot;
</ins><span class="cx"> #include &quot;Image.h&quot;
</span><span class="cx"> #include &quot;ImageOrientation.h&quot;
</span><span class="cx"> #include &quot;Path.h&quot;
</span><span class="lines">@@ -270,6 +271,7 @@
</span><span class="cx">         WEBCORE_EXPORT void setIsAcceleratedContext(bool);
</span><span class="cx"> #endif
</span><span class="cx">         bool isAcceleratedContext() const;
</span><ins>+        RenderingMode renderingMode() const { return isAcceleratedContext() ? Accelerated : Unaccelerated; }
</ins><span class="cx"> 
</span><span class="cx">         WEBCORE_EXPORT void save();
</span><span class="cx">         WEBCORE_EXPORT void restore();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.h (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.h        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.h        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -84,6 +84,12 @@
</span><span class="cx">     
</span><span class="cx">     enum TextAlign { StartTextAlign, EndTextAlign, LeftTextAlign, CenterTextAlign, RightTextAlign };
</span><span class="cx"> 
</span><ins>+    enum RenderingMode {
+        Unaccelerated,
+        UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
+        Accelerated
+    };
+
</ins><span class="cx">     String compositeOperatorName(CompositeOperator, BlendMode);
</span><span class="cx">     bool parseBlendMode(const String&amp;, BlendMode&amp;);
</span><span class="cx">     bool parseCompositeAndBlendOperator(const String&amp;, CompositeOperator&amp;, BlendMode&amp;);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> 
</span><span class="cx"> std::unique_ptr&lt;ImageBuffer&gt; ImageBuffer::createCompatibleBuffer(const FloatSize&amp; size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext&amp; context, bool)
</span><span class="cx"> {
</span><del>-    return create(size, resolutionScale, colorSpace, context.isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><ins>+    return create(size, context.renderingMode(), resolutionScale, colorSpace);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageBuffer.h (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageBuffer.h        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/ImageBuffer.h        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -55,12 +55,6 @@
</span><span class="cx">     Unmultiplied
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-enum RenderingMode {
-    Unaccelerated,
-    UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
-    Accelerated
-};
-
</del><span class="cx"> enum BackingStoreCopy {
</span><span class="cx">     CopyBackingStore, // Guarantee subsequent draws don't affect the copy.
</span><span class="cx">     DontCopyBackingStore // Subsequent draws may affect the copy.
</span><span class="lines">@@ -75,7 +69,7 @@
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(ImageBuffer); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx">     // Will return a null pointer on allocation failure.
</span><del>-    static std::unique_ptr&lt;ImageBuffer&gt; create(const FloatSize&amp; size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
</del><ins>+    static std::unique_ptr&lt;ImageBuffer&gt; create(const FloatSize&amp; size, RenderingMode renderingMode, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB)
</ins><span class="cx">     {
</span><span class="cx">         bool success = false;
</span><span class="cx">         std::unique_ptr&lt;ImageBuffer&gt; buffer(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> void NamedImageGeneratedImage::drawPattern(GraphicsContext&amp; context, const FloatRect&amp; srcRect, const AffineTransform&amp; patternTransform, const FloatPoint&amp; phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect&amp; dstRect, BlendMode blendMode)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><del>-//    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context-&gt;isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><span class="cx">     std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = context.createCompatibleBuffer(size(), true);
</span><span class="cx">     if (!imageBuffer)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -79,7 +79,9 @@
</span><span class="cx">         IntSize roundedSize(roundUpToMultipleOf32(size.width()), roundUpToMultipleOf32(size.height()));
</span><span class="cx"> 
</span><span class="cx">         clearScratchBuffer();
</span><del>-        m_imageBuffer = ImageBuffer::create(roundedSize, 1);
</del><ins>+
+        // ShadowBlur is not used with accelerated drawing, so it's OK to make an unconditionally unaccelerated buffer.
+        m_imageBuffer = ImageBuffer::create(roundedSize, Unaccelerated, 1);
</ins><span class="cx">         return m_imageBuffer.get();
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -322,7 +322,8 @@
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx">     // Make a copy of the source to ensure the bits don't change before being drawn
</span><span class="cx">     IntSize sourceCopySize(sourceRect.width(), sourceRect.height());
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; sourceCopy = ImageBuffer::create(sourceCopySize, 1, ColorSpaceDeviceRGB, Unaccelerated);
</del><ins>+    // FIXME (149431): Should this ImageBuffer be unconditionally unaccelerated? Making it match the context seems to break putData().
+    std::unique_ptr&lt;ImageBuffer&gt; sourceCopy = ImageBuffer::create(sourceCopySize, Unaccelerated, 1, ColorSpaceDeviceRGB);
</ins><span class="cx">     if (!sourceCopy)
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterEffectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterEffect.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">     if (m_openCLImageResult)
</span><span class="cx">         return openCLImageToImageBuffer();
</span><span class="cx"> #endif
</span><del>-    m_imageBufferResult = ImageBuffer::create(m_absolutePaintRect.size(), m_filter.filterScale(), m_resultColorSpace, m_filter.renderingMode());
</del><ins>+    m_imageBufferResult = ImageBuffer::create(m_absolutePaintRect.size(), m_filter.renderingMode(), m_filter.filterScale(), m_resultColorSpace);
</ins><span class="cx">     if (!m_imageBufferResult)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx">     if (context-&gt;isFailed(clEnqueueReadImage(context-&gt;commandQueue(), m_openCLImageResult, CL_TRUE, origin, region, 0, 0, destinationPixelArray-&gt;data(), 0, 0, 0)))
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    m_imageBufferResult = ImageBuffer::create(m_absolutePaintRect.size());
</del><ins>+    m_imageBufferResult = ImageBuffer::create(m_absolutePaintRect.size(), m_filter.renderingMode());
</ins><span class="cx">     if (!m_imageBufferResult)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     FloatSize clampedSize = ImageBuffer::clampedSize(m_absolutePaintRect.size());
</span><del>-    m_imageBufferResult = ImageBuffer::create(clampedSize, m_filter.filterScale(), m_resultColorSpace, m_filter.renderingMode());
</del><ins>+    m_imageBufferResult = ImageBuffer::create(clampedSize, m_filter.renderingMode(), m_filter.filterScale(), m_resultColorSpace);
</ins><span class="cx">     if (!m_imageBufferResult)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapBitmapTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -35,7 +35,9 @@
</span><span class="cx"> 
</span><span class="cx"> void BitmapTexture::updateContents(TextureMapper* textureMapper, GraphicsLayer* sourceLayer, const IntRect&amp; targetRect, const IntPoint&amp; offset, UpdateContentsFlag updateContentsFlag)
</span><span class="cx"> {
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(targetRect.size());
</del><ins>+    // Making an unconditionally unaccelerated buffer here is OK because this code
+    // isn't used by any platforms that respect the accelerated bit.
+    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(targetRect.size(), Unaccelerated);
</ins><span class="cx"> 
</span><span class="cx">     if (!imageBuffer)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">     if (!m_graphicsBufferAttached) {
</span><span class="cx">         IntSize logicalSize(m_sourceDrawingRegion.width(), m_sourceDrawingRegion.height());
</span><span class="cx">         if (!sourceImage() || sourceImage()-&gt;logicalSize() != logicalSize)
</span><del>-            setSourceImage(ImageBuffer::create(logicalSize, filterScale(), ColorSpaceDeviceRGB, renderingMode()));
</del><ins>+            setSourceImage(ImageBuffer::create(logicalSize, renderingMode(), filterScale()));
</ins><span class="cx">         m_graphicsBufferAttached = true;
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -6891,17 +6891,17 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     FilterInfo&amp; filterInfo = FilterInfo::get(*this);
</span><ins>+    Frame&amp; frame = renderer().frame();
</ins><span class="cx">     if (!filterInfo.renderer()) {
</span><span class="cx">         RefPtr&lt;FilterEffectRenderer&gt; filterRenderer = FilterEffectRenderer::create();
</span><del>-        filterRenderer-&gt;setFilterScale(renderer().frame().page()-&gt;deviceScaleFactor());
-        RenderingMode renderingMode = renderer().frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
-        filterRenderer-&gt;setRenderingMode(renderingMode);
</del><ins>+        filterRenderer-&gt;setFilterScale(frame.page()-&gt;deviceScaleFactor());
+        filterRenderer-&gt;setRenderingMode(frame.settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated);
</ins><span class="cx">         filterInfo.setRenderer(WTF::move(filterRenderer));
</span><span class="cx">         
</span><span class="cx">         // We can optimize away code paths in other places if we know that there are no software filters.
</span><span class="cx">         renderer().view().setHasSoftwareFilters(true);
</span><del>-    } else if (filterInfo.renderer()-&gt;filterScale() != renderer().frame().page()-&gt;deviceScaleFactor()) {
-        filterInfo.renderer()-&gt;setFilterScale(renderer().frame().page()-&gt;deviceScaleFactor());
</del><ins>+    } else if (filterInfo.renderer()-&gt;filterScale() != frame.page()-&gt;deviceScaleFactor()) {
+        filterInfo.renderer()-&gt;setFilterScale(frame.page()-&gt;deviceScaleFactor());
</ins><span class="cx">         filterInfo.renderer()-&gt;clearIntermediateResults();
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/Shape.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/Shape.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/shapes/Shape.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -179,7 +179,8 @@
</span><span class="cx">     IntRect imageRect = snappedIntRect(imageR);
</span><span class="cx">     IntRect marginRect = snappedIntRect(marginR);
</span><span class="cx">     auto intervals = std::make_unique&lt;RasterShapeIntervals&gt;(marginRect.height(), -marginRect.y());
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(imageRect.size());
</del><ins>+    // FIXME (149420): This buffer should not be unconditionally unaccelerated.
+    std::unique_ptr&lt;ImageBuffer&gt; imageBuffer = ImageBuffer::create(imageRect.size(), Unaccelerated);
</ins><span class="cx"> 
</span><span class="cx">     if (imageBuffer) {
</span><span class="cx">         GraphicsContext&amp; graphicsContext = imageBuffer-&gt;context();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx">     AffineTransform absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer);
</span><span class="cx"> 
</span><span class="cx">     if (shouldCreateClipperMaskImage &amp;&amp; !repaintRect.isEmpty()) {
</span><ins>+        // FIXME (149469): This image buffer should not be unconditionally unaccelerated. Making it match the context breaks nested clipping, though.
</ins><span class="cx">         clipperMaskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, ColorSpaceDeviceRGB, Unaccelerated);
</span><span class="cx">         if (!clipperMaskImage)
</span><span class="cx">             return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">     AffineTransform absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(*textRootBlock);
</span><span class="cx">     FloatRect repaintRect = textRootBlock-&gt;repaintRectInLocalCoordinates();
</span><span class="cx"> 
</span><del>-    auto maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, ColorSpaceDeviceRGB, Unaccelerated);
</del><ins>+    auto maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, ColorSpaceDeviceRGB, context-&gt;renderingMode());
</ins><span class="cx">     if (!maskImage)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx">     if (!maskerData-&gt;maskImage &amp;&amp; !repaintRect.isEmpty()) {
</span><span class="cx">         const SVGRenderStyle&amp; svgStyle = style().svgStyle();
</span><span class="cx">         ColorSpace colorSpace = svgStyle.colorInterpolation() == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB;
</span><ins>+        // FIXME (149470): This image buffer should not be unconditionally unaccelerated. Making it match the context breaks alpha masking, though.
</ins><span class="cx">         maskerData-&gt;maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, colorSpace, Unaccelerated);
</span><span class="cx">         if (!maskerData-&gt;maskImage)
</span><span class="cx">             return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">         static_cast&lt;float&gt;(m_attributes.patternTransform().yScale()));
</span><span class="cx"> 
</span><span class="cx">     // Build tile image.
</span><del>-    auto tileImage = createTileImage(m_attributes, tileBoundaries, absoluteTileBoundaries, tileImageTransform, clampedAbsoluteTileBoundaries, context.isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><ins>+    auto tileImage = createTileImage(m_attributes, tileBoundaries, absoluteTileBoundaries, tileImageTransform, clampedAbsoluteTileBoundaries, context.renderingMode());
</ins><span class="cx">     if (!tileImage)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx">     FloatSize scale;
</span><span class="cx">     FloatSize clampedSize = ImageBuffer::clampedSize(paintRect.size(), scale);
</span><span class="cx"> 
</span><del>-    auto imageBuffer = ImageBuffer::create(clampedSize, 1, colorSpace, renderingMode);
</del><ins>+    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, 1, colorSpace);
</ins><span class="cx">     if (!imageBuffer)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">     if (clampedSize.isEmpty())
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><del>-    auto imageBuffer = ImageBuffer::create(clampedSize, 1, colorSpace, renderingMode);
</del><ins>+    auto imageBuffer = ImageBuffer::create(clampedSize, renderingMode, 1, colorSpace);
</ins><span class="cx">     if (!imageBuffer)
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -173,7 +173,8 @@
</span><span class="cx">     if (!m_page)
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(size(), 1);
</del><ins>+    // Cairo does not use the accelerated drawing flag, so it's OK to make an unconditionally unaccelerated buffer.
+    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(size(), Unaccelerated);
</ins><span class="cx">     if (!buffer) // failed to allocate image
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
+        https://bugs.webkit.org/show_bug.cgi?id=149428
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::imageForCurrentSharingServicePickerItem):
+
</ins><span class="cx"> 2015-09-21  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r182648): UIWebView does not set location.hash synchronously
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -471,7 +471,8 @@
</span><span class="cx">     if (!clientFloatRectForNode(*node, rect))
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(rect.size());
</del><ins>+    // This is effectively a snapshot, and will be painted in an unaccelerated fashion in line with FrameSnapshotting.
+    std::unique_ptr&lt;ImageBuffer&gt; buffer = ImageBuffer::create(rect.size(), Unaccelerated);
</ins><span class="cx">     if (!buffer)
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebKit2/ChangeLog        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
+        https://bugs.webkit.org/show_bug.cgi?id=149428
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        * Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
+        (WebKit::ThreadSafeCoordinatedSurface::create):
+
</ins><span class="cx"> 2015-09-22  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WK2][NetworkCache] New entry bodies remain in dirty memory after being written to disk.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp (190123 => 190124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp        2015-09-22 18:27:26 UTC (rev 190123)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp        2015-09-22 18:45:54 UTC (rev 190124)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx"> 
</span><span class="cx"> Ref&lt;ThreadSafeCoordinatedSurface&gt; ThreadSafeCoordinatedSurface::create(const IntSize&amp; size, CoordinatedSurface::Flags flags)
</span><span class="cx"> {
</span><del>-    return adoptRef(*new ThreadSafeCoordinatedSurface(size, flags, ImageBuffer::create(size)));
</del><ins>+    // Making an unconditionally unaccelerated buffer here is OK because this code
+    // isn't used by any platforms that respect the accelerated bit.
+    return adoptRef(*new ThreadSafeCoordinatedSurface(size, flags, ImageBuffer::create(size, Unaccelerated)));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Ref&lt;ThreadSafeCoordinatedSurface&gt; ThreadSafeCoordinatedSurface::create(const IntSize&amp; size, CoordinatedSurface::Flags flags, std::unique_ptr&lt;ImageBuffer&gt; buffer)
</span></span></pre>
</div>
</div>

</body>
</html>