Changeset 236038 in webkit

Timestamp:

Sep 17, 2018, 1:49:07 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235171 - [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.

Location:

releases/WebKitGTK/webkit-2.22/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/ImageGStreamer.h (modified) (2 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2018-08-22  Zalan Bujtas  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h

@@ -39 +39 @@
 class ImageGStreamer : public RefCounted<ImageGStreamer> {
     public:
-        static Ref<ImageGStreamer> createImage(GstSample* sample)
+        static RefPtr<ImageGStreamer> createImage(GstSample* sample)
         {
-            return adoptRef(*new ImageGStreamer(sample));
+            auto image = adoptRef(new ImageGStreamer(sample));
+            if (!image->m_image)
+                return nullptr;
+
+            return image;
         }
         ~ImageGStreamer();
 
-        BitmapImage* image()
+        BitmapImage& image()
         {
             ASSERT(m_image);
-            return m_image.get();
+            return *m_image.get();
         }
 
@@ -54 +58 @@
         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());
         }

releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -967 +967 @@
         return;
 
-    if (Image* image = reinterpret_cast<Image*>(gstImage->image()))
-        context.drawImage(*image, rect, gstImage->rect(), paintingOptions);
+    context.drawImage(gstImage->image(), rect, gstImage->rect(), paintingOptions);
 }