Attachment 347621 Details for Bug 188780 – ROLLOUT of r234979

[patch] ROLLOUT of r234979

bug-188780-20180821043723.patch (text/plain), 3.01 KB, created by WebKit Commit Bot on 2018-08-21 01:37:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-08-21 01:37:23 PDT

Size: 3.01 KB

patch

obsolete

>Subversion Revision: 235107
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d5468439d0089e38b63facd276f706b85688a957..9740e3b5f925d8e446bc33a76516aedc654a7de9 100644
>--- 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-21  Saam barati  <sbarati@apple.com>
> 
>         JSRunLoopTimer may run part of a member function after it's destroyed
>diff --git a/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h
>index 46dcc5465592f6db7d9dda97d89c7eac50bea721..40724ea725129ec510810b22b11684f3e309c25e 100644
>--- 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
>index 1edb90542b8b95f9522f69d8bf23d632111b9a60..db6088e8b4e3c2001aa0fc50d9b5e1b0d3e448af 100644
>--- 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)

Actions: View | Formatted Diff | Diff

Attachments on bug 188780: 347621