Merge r235108 - Unreviewed, rolling out r234979.

https://bugs.webkit.org/show_bug.cgi?id=188780 broke ubuntu LTS build (Requested by philn on #webkit). Reverted changeset: "[GTK] Never return an uninitialized ImageGStreamer object." https://bugs.webkit.org/show_bug.cgi?id=188305 https://trac.webkit.org/changeset/234979
WebKit · Aug 24, 2018 · 0ceb206 · 0ceb206
1 parent cb4065f
commit 0ceb206
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2018-08-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r234979.
+        https://bugs.webkit.org/show_bug.cgi?id=188780
+
+        broke ubuntu LTS build (Requested by philn on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Never return an uninitialized ImageGStreamer object."
+        https://bugs.webkit.org/show_bug.cgi?id=188305
+        https://trac.webkit.org/changeset/234979
+
 2018-08-20  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: allow breakpoints to be set for specific event listeners

diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h
@@ -38,28 +38,24 @@ class IntSize;
 
 class ImageGStreamer : public RefCounted<ImageGStreamer> {
     public:
-        static RefPtr<ImageGStreamer> createImage(GstSample* sample)
+        static Ref<ImageGStreamer> createImage(GstSample* sample)
         {
-            auto image = adoptRef(*new ImageGStreamer(sample));
-            if (!image->m_image)
-                return nullptr;
-
-            return image;
+            return adoptRef(*new ImageGStreamer(sample));
         }
         ~ImageGStreamer();
 
-        BitmapImage& image()
+        BitmapImage* image()
         {
             ASSERT(m_image);
-            return *m_image.get();
+            return m_image.get();
         }
 
         void setCropRect(FloatRect rect) { m_cropRect = rect; }
         FloatRect rect()
         {
-            ASSERT(m_image);
             if (!m_cropRect.isEmpty())
                 return FloatRect(m_cropRect);
+            ASSERT(m_image);
             return FloatRect(0, 0, m_image->size().width(), m_image->size().height());
         }
 

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
@@ -966,7 +966,8 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext& context, const Floa
     if (!gstImage)
         return;
 
-    context.drawImage(gstImage->image(), rect, gstImage->rect(), paintingOptions);
+    if (Image* image = reinterpret_cast<Image*>(gstImage->image()))
+        context.drawImage(*image, rect, gstImage->rect(), paintingOptions);
 }
 
 #if USE(GSTREAMER_GL)