<!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>[235171] 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/235171">235171</a></dd>
<dt>Author</dt> <dd>Ms2ger@igalia.com</dd>
<dt>Date</dt> <dd>2018-08-22 07:47:03 -0700 (Wed, 22 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Never return an uninitialized ImageGStreamer object.
https://bugs.webkit.org/show_bug.cgi?id=188305

Reviewed by Philippe Normand.

The single caller was already checking for a null return value, so
make that check actually do something. Also remove the null-check on
the return value of image(), which asserted that it would never return
null.

Test: fast/canvas/canvas-createPattern-video-loading.html

* platform/graphics/gstreamer/ImageGStreamer.h:
(WebCore::ImageGStreamer::createImage): Return null if m_image wasn't created.
(WebCore::ImageGStreamer::image): Return a reference.
(WebCore::ImageGStreamer::rect): Always assert that m_image is present.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::paint): Update for new signature.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerImageGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (235170 => 235171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-08-22 14:27:43 UTC (rev 235170)
+++ trunk/Source/WebCore/ChangeLog      2018-08-22 14:47:03 UTC (rev 235171)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2018-08-22  Ms2ger  <Ms2ger@igalia.com>
+
+        [GTK] Never return an uninitialized ImageGStreamer object.
+        https://bugs.webkit.org/show_bug.cgi?id=188305
+
+        Reviewed by Philippe Normand.
+
+        The single caller was already checking for a null return value, so
+        make that check actually do something. Also remove the null-check on
+        the return value of image(), which asserted that it would never return
+        null.
+
+        Test: fast/canvas/canvas-createPattern-video-loading.html
+
+        * platform/graphics/gstreamer/ImageGStreamer.h:
+        (WebCore::ImageGStreamer::createImage): Return null if m_image wasn't created.
+        (WebCore::ImageGStreamer::image): Return a reference.
+        (WebCore::ImageGStreamer::rect): Always assert that m_image is present.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::paint): Update for new signature.
+
</ins><span class="cx"> 2018-08-22  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add changes missing from r234925.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerImageGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h (235170 => 235171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h        2018-08-22 14:27:43 UTC (rev 235170)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h   2018-08-22 14:47:03 UTC (rev 235171)
</span><span class="lines">@@ -38,24 +38,28 @@
</span><span class="cx"> 
</span><span class="cx"> class ImageGStreamer : public RefCounted<ImageGStreamer> {
</span><span class="cx">     public:
</span><del>-        static Ref<ImageGStreamer> createImage(GstSample* sample)
</del><ins>+        static RefPtr<ImageGStreamer> createImage(GstSample* sample)
</ins><span class="cx">         {
</span><del>-            return adoptRef(*new ImageGStreamer(sample));
</del><ins>+            auto image = adoptRef(new ImageGStreamer(sample));
+            if (!image->m_image)
+                return nullptr;
+
+            return image;
</ins><span class="cx">         }
</span><span class="cx">         ~ImageGStreamer();
</span><span class="cx"> 
</span><del>-        BitmapImage* image()
</del><ins>+        BitmapImage& image()
</ins><span class="cx">         {
</span><span class="cx">             ASSERT(m_image);
</span><del>-            return m_image.get();
</del><ins>+            return *m_image.get();
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         void setCropRect(FloatRect rect) { m_cropRect = rect; }
</span><span class="cx">         FloatRect rect()
</span><span class="cx">         {
</span><ins>+            ASSERT(m_image);
</ins><span class="cx">             if (!m_cropRect.isEmpty())
</span><span class="cx">                 return FloatRect(m_cropRect);
</span><del>-            ASSERT(m_image);
</del><span class="cx">             return FloatRect(0, 0, m_image->size().width(), m_image->size().height());
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (235170 => 235171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp     2018-08-22 14:27:43 UTC (rev 235170)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp        2018-08-22 14:47:03 UTC (rev 235171)
</span><span class="lines">@@ -966,8 +966,7 @@
</span><span class="cx">     if (!gstImage)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (Image* image = reinterpret_cast<Image*>(gstImage->image()))
-        context.drawImage(*image, rect, gstImage->rect(), paintingOptions);
</del><ins>+    context.drawImage(gstImage->image(), rect, gstImage->rect(), paintingOptions);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span></span></pre>
</div>
</div>

</body>
</html>