<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[244640] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/244640">244640</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-25 00:47:25 -0700 (Thu, 25 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/243197">r243197</a>)][GStreamer] http/tests/media/clearkey/collect-webkit-media-session.html hits an ASSERT
https://bugs.webkit.org/show_bug.cgi?id=197230

Reviewed by Xabier Rodriguez-Calvar.

Perform the resource loader disposal and destruction from the main
thread. Also ensure there's no circular reference between the
CachedResourceStreamingClient and WebKitWebSrc when disposing of
the private WebKitWebSrc storage.

* platform/graphics/gstreamer/MainThreadNotifier.h:
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(_WebKitWebSrcPrivate::~_WebKitWebSrcPrivate):
(webkit_web_src_class_init):
(webKitWebSrcDispose):
(webKitWebSrcCloseSession):
(webKitWebSrcFinalize): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMainThreadNotifierh">trunk/Source/WebCore/platform/graphics/gstreamer/MainThreadNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244639 => 244640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-25 06:42:40 UTC (rev 244639)
+++ trunk/Source/WebCore/ChangeLog      2019-04-25 07:47:25 UTC (rev 244640)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2019-04-25  Philippe Normand  <pnormand@igalia.com>
+
+        [REGRESSION(r243197)][GStreamer] http/tests/media/clearkey/collect-webkit-media-session.html hits an ASSERT
+        https://bugs.webkit.org/show_bug.cgi?id=197230
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Perform the resource loader disposal and destruction from the main
+        thread. Also ensure there's no circular reference between the
+        CachedResourceStreamingClient and WebKitWebSrc when disposing of
+        the private WebKitWebSrc storage.
+
+        * platform/graphics/gstreamer/MainThreadNotifier.h:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (_WebKitWebSrcPrivate::~_WebKitWebSrcPrivate):
+        (webkit_web_src_class_init):
+        (webKitWebSrcDispose):
+        (webKitWebSrcCloseSession):
+        (webKitWebSrcFinalize): Deleted.
+
</ins><span class="cx"> 2019-04-24  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] Hardcoded text color in input fields
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMainThreadNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MainThreadNotifier.h (244639 => 244640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MainThreadNotifier.h    2019-04-25 06:42:40 UTC (rev 244639)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MainThreadNotifier.h       2019-04-25 07:47:25 UTC (rev 244640)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx">         ASSERT(!m_isValid.load());
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    bool isValid() const { return m_isValid.load(); }
+
</ins><span class="cx">     template<typename F>
</span><span class="cx">     void notify(T notificationType, F&& callbackFunctor)
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (244639 => 244640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp    2019-04-25 06:42:40 UTC (rev 244639)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp       2019-04-25 07:47:25 UTC (rev 244640)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> 
</span><span class="cx">     const HashSet<RefPtr<WebCore::SecurityOrigin>>& securityOrigins() const { return m_origins; }
</span><span class="cx"> 
</span><ins>+    void setSourceElement(WebKitWebSrc* src) { m_src = GST_ELEMENT_CAST(src); }
+
</ins><span class="cx"> private:
</span><span class="cx">     void checkUpdateBlocksize(uint64_t bytesRead);
</span><span class="cx"> 
</span><span class="lines">@@ -73,10 +75,29 @@
</span><span class="cx"> enum MainThreadSourceNotification {
</span><span class="cx">     Start = 1 << 0,
</span><span class="cx">     Stop = 1 << 1,
</span><ins>+    Dispose = 1 << 2,
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #define WEBKIT_WEB_SRC_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SRC, WebKitWebSrcPrivate))
</span><span class="cx"> struct _WebKitWebSrcPrivate {
</span><ins>+    ~_WebKitWebSrcPrivate()
+    {
+        if (notifier && notifier->isValid()) {
+            notifier->notifyAndWait(MainThreadSourceNotification::Dispose, [&] {
+                if (resource) {
+                    auto* client = static_cast<CachedResourceStreamingClient*>(resource->client());
+                    if (client)
+                        client->setSourceElement(nullptr);
+
+                    resource->setClient(nullptr);
+                }
+                loader = nullptr;
+            });
+            notifier->invalidate();
+            notifier = nullptr;
+        }
+    }
+
</ins><span class="cx">     CString originalURI;
</span><span class="cx">     CString redirectedURI;
</span><span class="cx">     bool keepAlive;
</span><span class="lines">@@ -131,7 +152,6 @@
</span><span class="cx"> static void webKitWebSrcUriHandlerInit(gpointer gIface, gpointer ifaceData);
</span><span class="cx"> 
</span><span class="cx"> static void webKitWebSrcDispose(GObject*);
</span><del>-static void webKitWebSrcFinalize(GObject*);
</del><span class="cx"> static void webKitWebSrcSetProperty(GObject*, guint propertyID, const GValue*, GParamSpec*);
</span><span class="cx"> static void webKitWebSrcGetProperty(GObject*, guint propertyID, GValue*, GParamSpec*);
</span><span class="cx"> static GstStateChangeReturn webKitWebSrcChangeState(GstElement*, GstStateChange);
</span><span class="lines">@@ -158,7 +178,6 @@
</span><span class="cx">     GObjectClass* oklass = G_OBJECT_CLASS(klass);
</span><span class="cx"> 
</span><span class="cx">     oklass->dispose = webKitWebSrcDispose;
</span><del>-    oklass->finalize = webKitWebSrcFinalize;
</del><span class="cx">     oklass->set_property = webKitWebSrcSetProperty;
</span><span class="cx">     oklass->get_property = webKitWebSrcGetProperty;
</span><span class="cx"> 
</span><span class="lines">@@ -245,21 +264,10 @@
</span><span class="cx"> static void webKitWebSrcDispose(GObject* object)
</span><span class="cx"> {
</span><span class="cx">     WebKitWebSrcPrivate* priv = WEBKIT_WEB_SRC(object)->priv;
</span><del>-    if (priv->notifier) {
-        priv->notifier->invalidate();
-        priv->notifier = nullptr;
-    }
</del><span class="cx"> 
</span><del>-    GST_CALL_PARENT(G_OBJECT_CLASS, dispose, (object));
-}
-
-static void webKitWebSrcFinalize(GObject* object)
-{
-    WebKitWebSrcPrivate* priv = WEBKIT_WEB_SRC(object)->priv;
-
</del><span class="cx">     priv->~WebKitWebSrcPrivate();
</span><span class="cx"> 
</span><del>-    GST_CALL_PARENT(G_OBJECT_CLASS, finalize, (object));
</del><ins>+    GST_CALL_PARENT(G_OBJECT_CLASS, dispose, (object));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* value, GParamSpec* pspec)
</span></span></pre>
</div>
</div>

</body>
</html>