Changeset 202050 in webkit

Timestamp:

Jun 14, 2016 9:54:23 AM (8 years ago)

Author:

commit-queue@webkit.org

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GRefPtrGStreamer.h (modified) (1 diff)
• platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <nael.ouedraogo@crf.canon.fr>
 

trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp

@@ -343 +343 @@
 }
 
-// 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)
 {

trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h

@@ -109 +109 @@
 
 template<> GRefPtr<WebKitWebSrc> adoptGRef(WebKitWebSrc* ptr);
-GRefPtr<WebKitWebSrc> ensureGRef(WebKitWebSrc* ptr);
 template<> WebKitWebSrc* refGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);
 template<> void derefGPtr<WebKitWebSrc>(WebKitWebSrc* ptr);

trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

@@ -189 +189 @@
         }
 
-        GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+        GRefPtr<WebKitWebSrc> protector(src);
         priv->notifier.notify(MainThreadSourceNotification::NeedData, [protector] { webKitWebSrcNeedData(protector.get()); });
     },
@@ -203 +203 @@
         }
 
-        GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+        GRefPtr<WebKitWebSrc> protector(src);
         priv->notifier.notify(MainThreadSourceNotification::EnoughData, [protector] { webKitWebSrcEnoughData(protector.get()); });
     },
@@ -223 +223 @@
         }
 
-        GRefPtr<WebKitWebSrc> protector = WTF::ensureGRef(src);
+        GRefPtr<WebKitWebSrc> protector(src);
         priv->notifier.notify(MainThreadSourceNotification::Seek, [protector] { webKitWebSrcSeek(protector.get()); });
         return TRUE;
@@ -641 +641 @@
     {
         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;
@@ -649 +649 @@
         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;