Title: [202050] trunk/Source/WebCore
- Revision
- 202050
- Author
- [email protected]
- Date
- 2016-06-14 09:54:23 -0700 (Tue, 14 Jun 2016)
Log Message
Unreviewed, rolling out r200455.
https://bugs.webkit.org/show_bug.cgi?id=158740
hangs twitter/facebook (Requested by mcatanzaro on #webkit).
Reverted changeset:
"[GStreamer] Adaptive streaming issues"
https://bugs.webkit.org/show_bug.cgi?id=144040
http://trac.webkit.org/changeset/200455
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202049 => 202050)
--- trunk/Source/WebCore/ChangeLog 2016-06-14 16:46:26 UTC (rev 202049)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 16:54:23 UTC (rev 202050)
@@ -1,3 +1,16 @@
+2016-06-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r200455.
+ https://bugs.webkit.org/show_bug.cgi?id=158740
+
+ hangs twitter/facebook (Requested by mcatanzaro on #webkit).
+
+ Reverted changeset:
+
+ "[GStreamer] Adaptive streaming issues"
+ https://bugs.webkit.org/show_bug.cgi?id=144040
+ http://trac.webkit.org/changeset/200455
+
2016-06-14 Nael Ouedraogo <[email protected]>
WebRTC: RTCPeerConnection::addTrack() should throw InvalidAccessError instead of InvalidModificationError.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (202049 => 202050)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2016-06-14 16:46:26 UTC (rev 202049)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2016-06-14 16:54:23 UTC (rev 202050)
@@ -342,16 +342,6 @@
return GRefPtr<WebKitWebSrc>(ptr, GRefPtrAdopt);
}
-// This method is only available for WebKitWebSrc and should not be used for any other type.
-// This is only to work around a bug in GST where the URI downloader is not taking the ownership of WebKitWebSrc.
-// See https://bugs.webkit.org/show_bug.cgi?id=144040.
-GRefPtr<WebKitWebSrc> ensureGRef(WebKitWebSrc* ptr)
-{
- if (ptr && g_object_is_floating(ptr))
- gst_object_ref_sink(GST_OBJECT(ptr));
- return GRefPtr<WebKitWebSrc>(ptr);
-}
-
template <> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr)
{
if (ptr)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h (202049 => 202050)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2016-06-14 16:46:26 UTC (rev 202049)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2016-06-14 16:54:23 UTC (rev 202050)
@@ -108,7 +108,6 @@
template<> void derefGPtr<WebKitVideoSink>(WebKitVideoSink* ptr);
template<> GRefPtr<WebKitWebSrc> adoptGRef(WebKitWebSrc* ptr);
-GRefPtr<WebKitWebSrc> ensureGRef(WebKitWebSrc* ptr);
template<> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);
template<> void derefGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (202049 => 202050)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-06-14 16:46:26 UTC (rev 202049)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-06-14 16:54:23 UTC (rev 202050)
@@ -188,7 +188,7 @@
return;
}
- GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+ GRefPtr<WebKitWebSrc> protector(src);
priv->notifier.notify(MainThreadSourceNotification::NeedData, [protector] { webKitWebSrcNeedData(protector.get()); });
},
// enough_data
@@ -202,7 +202,7 @@
return;
}
- GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+ GRefPtr<WebKitWebSrc> protector(src);
priv->notifier.notify(MainThreadSourceNotification::EnoughData, [protector] { webKitWebSrcEnoughData(protector.get()); });
},
// seek_data
@@ -222,7 +222,7 @@
priv->requestedOffset = offset;
}
- GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+ GRefPtr<WebKitWebSrc> protector(src);
priv->notifier.notify(MainThreadSourceNotification::Seek, [protector] { webKitWebSrcSeek(protector.get()); });
return TRUE;
},
@@ -640,7 +640,7 @@
case GST_STATE_CHANGE_READY_TO_PAUSED:
{
GST_DEBUG_OBJECT(src, "READY->PAUSED");
- GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+ GRefPtr<WebKitWebSrc> protector(src);
priv->notifier.notify(MainThreadSourceNotification::Start, [protector] { webKitWebSrcStart(protector.get()); });
break;
}
@@ -648,7 +648,7 @@
{
GST_DEBUG_OBJECT(src, "PAUSED->READY");
priv->notifier.cancelPendingNotifications();
- GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+ GRefPtr<WebKitWebSrc> protector(src);
priv->notifier.notify(MainThreadSourceNotification::Stop, [protector] { webKitWebSrcStop(protector.get()); });
break;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
