<!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>[190938] releases/WebKitGTK/webkit-2.10/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/190938">190938</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 02:35:51 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190124">r190124</a> - 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="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorecssCSSFilterImageValuecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSFilterImageValue.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlHTMLCanvasElementcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLCanvasElement.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlshadowMediaControlElementscpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageFrameSnapshottingcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameSnapshotting.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsBitmapImagecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsGraphicsContexth">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsGraphicsTypesh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsTypes.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsImageBuffercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsImageBufferh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsShadowBlurcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicscgImageBufferCGcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsfiltersFilterEffectcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/filters/FilterEffect.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTexturecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingFilterEffectRenderercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingshapesShapecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/shapes/Shape.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceClippercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceGradientcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceMaskercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourcePatterncpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgSVGRenderingContextcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoresvggraphicsSVGImagecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKitmacChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKitmacWebCoreSupportWebContextMenuClientmm">releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -1,3 +1,100 @@
</span><ins>+2015-09-22 Tim Horton <timothy_horton@apple.com>
+
+ 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 sangdeug.kim <sangdeug.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> CurrentTime on mediaController is set as 0 when playback is completed.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorecssCSSFilterImageValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSFilterImageValue.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSFilterImageValue.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSFilterImageValue.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> texture = ImageBuffer::create(size);
</del><ins>+ // FIXME (149424): This buffer should not be unconditionally unaccelerated.
+ std::unique_ptr<ImageBuffer> texture = ImageBuffer::create(size, Unaccelerated);
</ins><span class="cx"> if (!texture)
</span><span class="cx"> return Image::nullImage();
</span><span class="cx"> texture->context()->drawImage(image, ColorSpaceDeviceRGB, IntPoint());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlHTMLCanvasElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLCanvasElement.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLCanvasElement.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLCanvasElement.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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->context()->setShadowsIgnoreTransforms(true);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -1684,8 +1684,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageBuffer> CanvasRenderingContext2D::createCompositingBuffer(const IntRect& 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& bufferRect, CompositeOperator op)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> temp = ImageBuffer::create(size, 1);
</del><ins>+ // FIXME (149423): Should this ImageBuffer be unconditionally unaccelerated?
+ std::unique_ptr<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/MediaControlElements.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -1378,7 +1378,8 @@
</span><span class="cx">
</span><span class="cx"> IntRect paintingRect = IntRect(IntPoint(), layer->size());
</span><span class="cx">
</span><del>- std::unique_ptr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor, ColorSpaceDeviceRGB));
</del><ins>+ // FIXME (149422): This buffer should not be unconditionally unaccelerated.
+ std::unique_ptr<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCorepageFrameSnapshottingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameSnapshotting.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameSnapshotting.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameSnapshotting.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> if (frame.settings().delegatesPageScaling())
</span><span class="cx"> scaleFactor *= frame.page()->pageScaleFactor();
</span><span class="cx">
</span><del>- std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(imageRect.size(), scaleFactor, ColorSpaceDeviceRGB);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(imageRect.size(), Unaccelerated, scaleFactor);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx"> buffer->context()->translate(-imageRect.x(), -imageRect.y());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/BitmapImage.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> buffer = ImageBuffer::create(expandedIntSize(tileRect.size()));
</del><ins>+ std::unique_ptr<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsCrossfadeGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> void CrossfadeGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</span><span class="cx"> {
</span><del>- std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><ins>+ std::unique_ptr<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext.h (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsContext.h 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "Gradient.h"
</span><ins>+#include "GraphicsTypes.h"
</ins><span class="cx"> #include "Image.h"
</span><span class="cx"> #include "ImageOrientation.h"
</span><span class="cx"> #include "Path.h"
</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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsGraphicsTypesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsTypes.h (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-13 09:35:51 UTC (rev 190938)
</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&, BlendMode&);
</span><span class="cx"> bool parseCompositeAndBlendOperator(const String&, CompositeOperator&, BlendMode&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsImageBuffercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageBuffer> ImageBuffer::createCompatibleBuffer(const FloatSize& size, float resolutionScale, ColorSpace colorSpace, const GraphicsContext* 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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsImageBufferh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.h (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.h 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ImageBuffer.h 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> create(const FloatSize& size, float resolutionScale = 1, ColorSpace colorSpace = ColorSpaceDeviceRGB, RenderingMode renderingMode = Unaccelerated)
</del><ins>+ static std::unique_ptr<ImageBuffer> create(const FloatSize& 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<ImageBuffer> buffer(new ImageBuffer(size, resolutionScale, colorSpace, renderingMode, success));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsNamedImageGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> void NamedImageGeneratedImage::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator compositeOp, const FloatRect& dstRect, BlendMode blendMode)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NEW_THEME)
</span><del>-// std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(size(), 1, ColorSpaceDeviceRGB, context->isAcceleratedContext() ? Accelerated : Unaccelerated);
</del><span class="cx"> std::unique_ptr<ImageBuffer> imageBuffer = context->createCompatibleBuffer(size(), true);
</span><span class="cx"> if (!imageBuffer)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ShadowBlur.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> 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<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsfiltersFilterEffectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/filters/FilterEffect.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/filters/FilterEffect.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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->isFailed(clEnqueueReadImage(context->commandQueue(), m_openCLImageResult, CL_TRUE, origin, region, 0, 0, destinationPixelArray->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="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicstexmapBitmapTexturecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/texmap/BitmapTexture.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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& targetRect, const IntPoint& offset, UpdateContentsFlag updateContentsFlag)
</span><span class="cx"> {
</span><del>- std::unique_ptr<ImageBuffer> 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<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/FilterEffectRenderer.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/FilterEffectRenderer.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/FilterEffectRenderer.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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()->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="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayer.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayer.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayer.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -6887,17 +6887,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FilterInfo& filterInfo = FilterInfo::get(*this);
</span><ins>+ Frame& frame = renderer().frame();
</ins><span class="cx"> if (!filterInfo.renderer()) {
</span><span class="cx"> RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
</span><del>- filterRenderer->setFilterScale(renderer().frame().page()->deviceScaleFactor());
- RenderingMode renderingMode = renderer().frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
- filterRenderer->setRenderingMode(renderingMode);
</del><ins>+ filterRenderer->setFilterScale(frame.page()->deviceScaleFactor());
+ filterRenderer->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()->filterScale() != renderer().frame().page()->deviceScaleFactor()) {
- filterInfo.renderer()->setFilterScale(renderer().frame().page()->deviceScaleFactor());
</del><ins>+ } else if (filterInfo.renderer()->filterScale() != frame.page()->deviceScaleFactor()) {
+ filterInfo.renderer()->setFilterScale(frame.page()->deviceScaleFactor());
</ins><span class="cx"> filterInfo.renderer()->clearIntermediateResults();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingshapesShapecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/shapes/Shape.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/shapes/Shape.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/shapes/Shape.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<RasterShapeIntervals>(marginRect.height(), -marginRect.y());
</span><del>- std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(imageRect.size());
</del><ins>+ // FIXME (149420): This buffer should not be unconditionally unaccelerated.
+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::create(imageRect.size(), Unaccelerated);
</ins><span class="cx">
</span><span class="cx"> if (imageBuffer) {
</span><span class="cx"> GraphicsContext* graphicsContext = imageBuffer->context();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -141,6 +141,7 @@
</span><span class="cx"> AffineTransform absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(renderer);
</span><span class="cx">
</span><span class="cx"> if (shouldCreateClipperMaskImage && !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="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> AffineTransform absoluteTransform = SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem(*textRootBlock);
</span><span class="cx"> FloatRect repaintRect = textRootBlock->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->renderingMode());
</ins><span class="cx"> if (!maskImage)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> if (!maskerData->maskImage && !repaintRect.isEmpty()) {
</span><span class="cx"> const SVGRenderStyle& 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->maskImage = SVGRenderingContext::createImageBuffer(repaintRect, absoluteTransform, colorSpace, Unaccelerated);
</span><span class="cx"> if (!maskerData->maskImage)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> static_cast<float>(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="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -247,7 +247,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">@@ -270,7 +270,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="releasesWebKitGTKwebkit210SourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/graphics/SVGImage.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/graphics/SVGImage.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/svg/graphics/SVGImage.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</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<ImageBuffer> 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<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/ChangeLog 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22 Tim Horton <timothy_horton@apple.com>
+
+ 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-08-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace all remaining uses of WTF::Mutex with WTF::Lock
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -465,7 +465,8 @@
</span><span class="cx"> if (!clientFloatRectForNode(*node, rect))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- std::unique_ptr<ImageBuffer> 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<ImageBuffer> 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="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22 Tim Horton <timothy_horton@apple.com>
+
+ 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 <akling@apple.com>
</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="releasesWebKitGTKwebkit210SourceWebKit2SharedCoordinatedGraphicsthreadedcompositorThreadSafeCoordinatedSurfacecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp (190937 => 190938)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2015-10-13 09:19:22 UTC (rev 190937)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2015-10-13 09:35:51 UTC (rev 190938)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx">
</span><span class="cx"> Ref<ThreadSafeCoordinatedSurface> ThreadSafeCoordinatedSurface::create(const IntSize& 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<ThreadSafeCoordinatedSurface> ThreadSafeCoordinatedSurface::create(const IntSize& size, CoordinatedSurface::Flags flags, std::unique_ptr<ImageBuffer> buffer)
</span></span></pre>
</div>
</div>
</body>
</html>