<!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>[210501] 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/210501">210501</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-09 04:12:14 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] WebProcess from WebKitGtk+ 2.15.2 SIGSEGVs in std::unique_ptr<SoupBuffer, WTF::GPtrDeleter<SoupBuffer> >::get() const () at /usr/include/c++/6/bits/unique_ptr.h:305
https://bugs.webkit.org/show_bug.cgi?id=165848
Reviewed by Michael Catanzaro.
In <a href="http://trac.webkit.org/projects/webkit/changeset/208881">r208881</a> several locks were added to ImageDecoder to prevent frameBufferAtIndex() from being called by multiple
threads at the same time, but I forgot isSizeAvailable() also calls frameBufferAtIndex(). However, what we
really need to protect is the GIFImageDecoder, to never allow decoding from more than one thread at the same
time. This patch reverts <a href="http://trac.webkit.org/projects/webkit/changeset/208881">r208881</a> and adds a lock to GIFImageDecoder::decode() instead.
* platform/image-decoders/ImageDecoder.cpp:
(WebCore::ImageDecoder::frameIsCompleteAtIndex):
(WebCore::ImageDecoder::frameDurationAtIndex):
(WebCore::ImageDecoder::createFrameImageAtIndex):
* platform/image-decoders/ImageDecoder.h:
* platform/image-decoders/gif/GIFImageDecoder.cpp:
(WebCore::GIFImageDecoder::decode):
* platform/image-decoders/gif/GIFImageDecoder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersImageDecoderh">trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersgifGIFImageDecodercpp">trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformimagedecodersgifGIFImageDecoderh">trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210500 => 210501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-09 11:25:49 UTC (rev 210500)
+++ trunk/Source/WebCore/ChangeLog 2017-01-09 12:12:14 UTC (rev 210501)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-09 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebProcess from WebKitGtk+ 2.15.2 SIGSEGVs in std::unique_ptr<SoupBuffer, WTF::GPtrDeleter<SoupBuffer> >::get() const () at /usr/include/c++/6/bits/unique_ptr.h:305
+ https://bugs.webkit.org/show_bug.cgi?id=165848
+
+ Reviewed by Michael Catanzaro.
+
+ In r208881 several locks were added to ImageDecoder to prevent frameBufferAtIndex() from being called by multiple
+ threads at the same time, but I forgot isSizeAvailable() also calls frameBufferAtIndex(). However, what we
+ really need to protect is the GIFImageDecoder, to never allow decoding from more than one thread at the same
+ time. This patch reverts r208881 and adds a lock to GIFImageDecoder::decode() instead.
+
+ * platform/image-decoders/ImageDecoder.cpp:
+ (WebCore::ImageDecoder::frameIsCompleteAtIndex):
+ (WebCore::ImageDecoder::frameDurationAtIndex):
+ (WebCore::ImageDecoder::createFrameImageAtIndex):
+ * platform/image-decoders/ImageDecoder.h:
+ * platform/image-decoders/gif/GIFImageDecoder.cpp:
+ (WebCore::GIFImageDecoder::decode):
+ * platform/image-decoders/gif/GIFImageDecoder.h:
+
</ins><span class="cx"> 2017-01-09 Alejandro G. Castro <alex@igalia.com>
</span><span class="cx">
</span><span class="cx"> [OWR] Unskip fast/mediastream/MediaStream-video-element-track-stop.html
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp (210500 => 210501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2017-01-09 11:25:49 UTC (rev 210500)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2017-01-09 12:12:14 UTC (rev 210501)
</span><span class="lines">@@ -170,7 +170,6 @@
</span><span class="cx">
</span><span class="cx"> bool ImageDecoder::frameIsCompleteAtIndex(size_t index)
</span><span class="cx"> {
</span><del>- LockHolder locker(m_lock);
</del><span class="cx"> ImageFrame* buffer = frameBufferAtIndex(index);
</span><span class="cx"> return buffer && buffer->isComplete();
</span><span class="cx"> }
</span><span class="lines">@@ -194,7 +193,6 @@
</span><span class="cx">
</span><span class="cx"> float ImageDecoder::frameDurationAtIndex(size_t index)
</span><span class="cx"> {
</span><del>- LockHolder locker(m_lock);
</del><span class="cx"> ImageFrame* buffer = frameBufferAtIndex(index);
</span><span class="cx"> if (!buffer || buffer->isEmpty())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -215,7 +213,6 @@
</span><span class="cx"> if (size().isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- LockHolder locker(m_lock);
</del><span class="cx"> ImageFrame* buffer = frameBufferAtIndex(index);
</span><span class="cx"> if (!buffer || buffer->isEmpty() || !buffer->hasBackingStore())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h (210500 => 210501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2017-01-09 11:25:49 UTC (rev 210500)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h 2017-01-09 12:12:14 UTC (rev 210501)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "PlatformScreen.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/Lock.h>
</del><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -215,7 +214,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool m_isAllDataReceived { false };
</span><span class="cx"> bool m_failed { false };
</span><del>- Lock m_lock;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersgifGIFImageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp (210500 => 210501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2017-01-09 11:25:49 UTC (rev 210500)
+++ trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2017-01-09 12:12:14 UTC (rev 210501)
</span><span class="lines">@@ -306,6 +306,7 @@
</span><span class="cx"> if (failed())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LockHolder locker(m_decodeLock);
</ins><span class="cx"> if (!m_reader) {
</span><span class="cx"> m_reader = std::make_unique<GIFImageReader>(this);
</span><span class="cx"> m_reader->setData(m_data.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformimagedecodersgifGIFImageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h (210500 => 210501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h 2017-01-09 11:25:49 UTC (rev 210500)
+++ trunk/Source/WebCore/platform/image-decoders/gif/GIFImageDecoder.h 2017-01-09 12:12:14 UTC (rev 210501)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "ImageDecoder.h"
</span><ins>+#include <wtf/Lock.h>
</ins><span class="cx">
</span><span class="cx"> class GIFImageReader;
</span><span class="cx">
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> bool m_currentBufferSawAlpha;
</span><span class="cx"> mutable RepetitionCount m_repetitionCount { RepetitionCountOnce };
</span><span class="cx"> std::unique_ptr<GIFImageReader> m_reader;
</span><ins>+ Lock m_decodeLock;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>