Title: [235108] trunk/Source/WebCore
- Revision
- 235108
- Author
- [email protected]
- Date
- 2018-08-21 01:39:23 -0700 (Tue, 21 Aug 2018)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235107 => 235108)
--- trunk/Source/WebCore/ChangeLog 2018-08-21 07:27:26 UTC (rev 235107)
+++ trunk/Source/WebCore/ChangeLog 2018-08-21 08:39:23 UTC (rev 235108)
@@ -1,3 +1,16 @@
+2018-08-21 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
JSRunLoopTimer may run part of a member function after it's destroyed
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h (235107 => 235108)
--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2018-08-21 07:27:26 UTC (rev 235107)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2018-08-21 08:39:23 UTC (rev 235108)
@@ -38,28 +38,24 @@
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());
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (235107 => 235108)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-08-21 07:27:26 UTC (rev 235107)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-08-21 08:39:23 UTC (rev 235108)
@@ -966,7 +966,8 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
