<!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>[198205] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198205">198205</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-15 01:58:27 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Leak: Accelerated ImageBufferCairo doesn't destroy the used textures
https://bugs.webkit.org/show_bug.cgi?id=155431
Patch by Miguel Gomez <magomez@igalia.com> on 2016-03-15
Reviewed by Žan Doberšek.
When using the Cairo backend, add a destructor to ImageBufferData and use it to destroy the
textures created if the buffer is being accelerated.
No new tests, already covered by existing ones.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBufferData::ImageBufferData):
Store the renderingMode flag.
(WebCore::ImageBufferData::~ImageBufferData):
Destroy gl resources if renderingMode is accelerated.
(WebCore::ImageBuffer::ImageBuffer):
Pass renderingMode to the data class and use it fro checks instead of the function parameter.
* platform/graphics/cairo/ImageBufferDataCairo.h:
Add destructor and a renderingMode flag.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198204 => 198205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-15 08:49:05 UTC (rev 198204)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 08:58:27 UTC (rev 198205)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-15 Miguel Gomez <magomez@igalia.com>
+
+ Leak: Accelerated ImageBufferCairo doesn't destroy the used textures
+ https://bugs.webkit.org/show_bug.cgi?id=155431
+
+ Reviewed by Žan Doberšek.
+
+ When using the Cairo backend, add a destructor to ImageBufferData and use it to destroy the
+ textures created if the buffer is being accelerated.
+
+ No new tests, already covered by existing ones.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBufferData::ImageBufferData):
+ Store the renderingMode flag.
+ (WebCore::ImageBufferData::~ImageBufferData):
+ Destroy gl resources if renderingMode is accelerated.
+ (WebCore::ImageBuffer::ImageBuffer):
+ Pass renderingMode to the data class and use it fro checks instead of the function parameter.
+ * platform/graphics/cairo/ImageBufferDataCairo.h:
+ Add destructor and a renderingMode flag.
+
</ins><span class="cx"> 2016-03-15 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> URL Parsing should signal failure for illegal IDN
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (198204 => 198205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-03-15 08:49:05 UTC (rev 198204)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-03-15 08:58:27 UTC (rev 198205)
</span><span class="lines">@@ -68,9 +68,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ImageBufferData::ImageBufferData(const IntSize& size)
</del><ins>+ImageBufferData::ImageBufferData(const IntSize& size, RenderingMode renderingMode)
</ins><span class="cx"> : m_platformContext(0)
</span><span class="cx"> , m_size(size)
</span><ins>+ , m_renderingMode(renderingMode)
</ins><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><span class="cx"> , m_platformLayerProxy(adoptRef(new TextureMapperPlatformLayerProxy))
</span><span class="lines">@@ -81,8 +82,30 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ImageBufferData::~ImageBufferData()
+{
+ if (m_renderingMode != Accelerated)
+ return;
+
</ins><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><ins>+ GLContext* previousActiveContext = GLContext::getCurrent();
+ GLContext::sharingContext()->makeContextCurrent();
+
+ if (m_texture)
+ glDeleteTextures(1, &m_texture);
+
</ins><span class="cx"> #if USE(COORDINATED_GRAPHICS_THREADED)
</span><ins>+ if (m_compositorTexture)
+ glDeleteTextures(1, &m_compositorTexture);
+#endif
+
+ if (previousActiveContext)
+ previousActiveContext->makeContextCurrent();
+#endif
+}
+
+#if ENABLE(ACCELERATED_2D_CANVAS)
+#if USE(COORDINATED_GRAPHICS_THREADED)
</ins><span class="cx"> void ImageBufferData::createCompositorBuffer()
</span><span class="cx"> {
</span><span class="cx"> GLContext::sharingContext()->makeContextCurrent();
</span><span class="lines">@@ -163,7 +186,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ImageBuffer::ImageBuffer(const FloatSize& size, float /* resolutionScale */, ColorSpace, RenderingMode renderingMode, bool& success)
</span><del>- : m_data(IntSize(size))
</del><ins>+ : m_data(IntSize(size), renderingMode)
</ins><span class="cx"> , m_size(size)
</span><span class="cx"> , m_logicalSize(size)
</span><span class="cx"> {
</span><span class="lines">@@ -172,14 +195,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><del>- if (renderingMode == Accelerated) {
</del><ins>+ if (m_data.m_renderingMode == Accelerated) {
</ins><span class="cx"> m_data.createCairoGLSurface();
</span><span class="cx"> if (!m_data.m_surface || cairo_surface_status(m_data.m_surface.get()) != CAIRO_STATUS_SUCCESS)
</span><del>- renderingMode = Unaccelerated; // If allocation fails, fall back to non-accelerated path.
</del><ins>+ m_data.m_renderingMode = Unaccelerated; // If allocation fails, fall back to non-accelerated path.
</ins><span class="cx"> }
</span><del>- if (renderingMode == Unaccelerated)
</del><ins>+ if (m_data.m_renderingMode == Unaccelerated)
</ins><span class="cx"> #else
</span><del>- ASSERT_UNUSED(renderingMode, renderingMode != Accelerated);
</del><ins>+ ASSERT(m_data.m_renderingMode != Accelerated);
</ins><span class="cx"> #endif
</span><span class="cx"> m_data.m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size.width(), size.height()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferDataCairoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h (198204 => 198205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2016-03-15 08:49:05 UTC (rev 198204)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h 2016-03-15 08:58:27 UTC (rev 198205)
</span><span class="lines">@@ -54,12 +54,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- ImageBufferData(const IntSize&);
</del><ins>+ ImageBufferData(const IntSize&, RenderingMode);
+ virtual ~ImageBufferData();
</ins><span class="cx">
</span><span class="cx"> RefPtr<cairo_surface_t> m_surface;
</span><span class="cx"> PlatformContextCairo m_platformContext;
</span><span class="cx"> std::unique_ptr<GraphicsContext> m_context;
</span><span class="cx"> IntSize m_size;
</span><ins>+ RenderingMode m_renderingMode;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> void createCairoGLSurface();
</span></span></pre>
</div>
</div>
</body>
</html>