<!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>[187941] releases/WebKitGTK/webkit-2.8/Source</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/187941">187941</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-05 00:17:59 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187432">r187432</a> - [GTK] Pass a GstInstallPluginsContext to gst_install_plugins_async
https://bugs.webkit.org/show_bug.cgi?id=147103
Reviewed by Philippe Normand.
Source/WebCore:
* platform/graphics/gstreamer/GUniquePtrGStreamer.h: Allow to use
GUniquePtr with GstInstallPluginsContext.
Source/WebKit2:
This allows PackageKit to properly position the window and make it
transient to the web view window.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::setCursor): Disambiguate Cursor now that
we include gtkx.h.
(WebKit::PageClientImpl::createGstInstallPluginsContext): Create a
new GstInstallPluginsContext and set the web view window XID when
running on X11.
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/PageClient.h:
* UIProcess/efl/WebViewEfl.h:
* UIProcess/gstreamer/WebPageProxyGStreamer.cpp:
(WebKit::WebPageProxy::requestInstallMissingMediaPlugins): Use
PageClient::createGstInstallPluginsContext() to create a new
GstInstallPluginsContext and pass it to gst_install_plugins_async().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsgstreamerGUniquePtrGStreamerh">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkPageClientImplcpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkPageClientImplh">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessPageClienth">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebKit2UIProcessgstreamerWebPageProxyGStreamercpp">releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Pass a GstInstallPluginsContext to gst_install_plugins_async
+ https://bugs.webkit.org/show_bug.cgi?id=147103
+
+ Reviewed by Philippe Normand.
+
+ * platform/graphics/gstreamer/GUniquePtrGStreamer.h: Allow to use
+ GUniquePtr with GstInstallPluginsContext.
+
</ins><span class="cx"> 2015-07-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Crashes during plugin installation
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsgstreamerGUniquePtrGStreamerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -22,11 +22,13 @@
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx">
</span><span class="cx"> #include <gst/gststructure.h>
</span><ins>+#include <gst/pbutils/install-plugins.h>
</ins><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> WTF_DEFINE_GPTR_DELETER(GstStructure, gst_structure_free)
</span><ins>+WTF_DEFINE_GPTR_DELETER(GstInstallPluginsContext, gst_install_plugins_context_free)
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-07-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Pass a GstInstallPluginsContext to gst_install_plugins_async
+ https://bugs.webkit.org/show_bug.cgi?id=147103
+
+ Reviewed by Philippe Normand.
+
+ This allows PackageKit to properly position the window and make it
+ transient to the web view window.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::setCursor): Disambiguate Cursor now that
+ we include gtkx.h.
+ (WebKit::PageClientImpl::createGstInstallPluginsContext): Create a
+ new GstInstallPluginsContext and set the web view window XID when
+ running on X11.
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/efl/WebViewEfl.h:
+ * UIProcess/gstreamer/WebPageProxyGStreamer.cpp:
+ (WebKit::WebPageProxy::requestInstallMissingMediaPlugins): Use
+ PageClient::createGstInstallPluginsContext() to create a new
+ GstInstallPluginsContext and pass it to gst_install_plugins_async().
+
</ins><span class="cx"> 2015-07-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Networking process crash in NetworkConnectionToWebProcess::convertMainResourceLoadToDownload while attempting to download a blob
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(X11)
+#include <gdk/gdkx.h>
+#undef KeyPress
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -132,7 +137,7 @@
</span><span class="cx"> webkitWebViewBaseSetTooltipText(WEBKIT_WEB_VIEW_BASE(m_viewWidget), newToolTip.utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageClientImpl::setCursor(const Cursor& cursor)
</del><ins>+void PageClientImpl::setCursor(const WebCore::Cursor& cursor)
</ins><span class="cx"> {
</span><span class="cx"> if (!gtk_widget_get_realized(m_viewWidget))
</span><span class="cx"> return;
</span><span class="lines">@@ -427,4 +432,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
+GUniquePtr<GstInstallPluginsContext> PageClientImpl::createGstInstallPluginsContext()
+{
+#if PLATFORM(X11)
+ if (GDK_IS_X11_DISPLAY(gdk_display_manager_get_default_display(gdk_display_manager_get()))) {
+ GUniquePtr<GstInstallPluginsContext> context(gst_install_plugins_context_new());
+ gst_install_plugins_context_set_xid(context.get(), GDK_WINDOW_XID(gtk_widget_get_window(m_viewWidget)));
+ return context;
+ }
+#endif
+
+ return nullptr;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -136,6 +136,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
+ virtual GUniquePtr<GstInstallPluginsContext> createGstInstallPluginsContext() override;
+#endif
+
</ins><span class="cx"> // Members of PageClientImpl class
</span><span class="cx"> GtkWidget* m_viewWidget;
</span><span class="cx"> DefaultUndoController m_undoController;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/PageClient.h (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/PageClient.h 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/PageClient.h 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -34,6 +34,10 @@
</span><span class="cx"> #include <WebCore/EditorClient.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO) && USE(GSTREAMER)
+#include <WebCore/GUniquePtrGStreamer.h>
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "PluginComplexTextInputState.h"
</span><span class="cx">
</span><span class="lines">@@ -315,6 +319,10 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> virtual void didPerformActionMenuHitTest(const ActionMenuHitTestResult&, bool forImmediateAction, API::Object*) = 0;
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+ virtual GUniquePtr<GstInstallPluginsContext> createGstInstallPluginsContext() = 0;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebKit2UIProcessgstreamerWebPageProxyGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp (187940 => 187941)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp 2015-08-05 06:04:41 UTC (rev 187940)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp 2015-08-05 07:17:59 UTC (rev 187941)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && USE(GSTREAMER)
</span><span class="cx">
</span><ins>+#include "PageClient.h"
</ins><span class="cx"> #include "WebPageMessages.h"
</span><del>-#include <gst/pbutils/install-plugins.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> CString detail = details.utf8();
</span><span class="cx"> const char* detailArray[2] = { detail.data(), nullptr };
</span><span class="cx"> ref();
</span><del>- // FIXME: Use a proper GstInstallPluginsContext instead of nullptr.
- GstInstallPluginsReturn result = gst_install_plugins_async(detailArray, nullptr, [](GstInstallPluginsReturn result, gpointer userData) {
</del><ins>+ GUniquePtr<GstInstallPluginsContext> context = m_pageClient.createGstInstallPluginsContext();
+ GstInstallPluginsReturn result = gst_install_plugins_async(detailArray, context.get(), [](GstInstallPluginsReturn result, gpointer userData) {
</ins><span class="cx"> RefPtr<WebPageProxy> page = adoptRef(static_cast<WebPageProxy*>(userData));
</span><span class="cx"> if (page->isValid())
</span><span class="cx"> page->send(Messages::WebPage::DidEndRequestInstallMissingMediaPlugins(static_cast<uint32_t>(result)));
</span></span></pre>
</div>
</div>
</body>
</html>