<!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>[195351] releases/WebKitGTK/webkit-2.10/Source/WebKit2</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/195351">195351</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-20 04:43:07 -0800 (Wed, 20 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195231">r195231</a> - [EFL][GTK][WK2] Fix UIProcess build with GStreamer and without VIDEO
https://bugs.webkit.org/show_bug.cgi?id=153135

Patch by Olivier Blin &lt;olivier.blin@softathome.com&gt; on 2016-01-18
Reviewed by Michael Catanzaro.

GStreamer builds fail when WebAudio is enabled but VIDEO disabled.

This change makes the flag more consistent around the
decicePolicyForInstallMissingMediaPluginsPermissionRequest() method:
ENABLE(VIDEO) &amp;&amp; USE(GSTREAMER) everywhere, while the code used to
test either one or the other.

This does not enable InstallMissingMediaPlugins for WebAudio, since no
code makes use of this in WebKitWebAudioSourceGStreamer.

It also fixes a naming typo for the following method:
decidePolicyForInstallMissingMediaPluginsPermissionRequest()

* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/PageClient.h:
* UIProcess/efl/WebViewEfl.h:
* UIProcess/gstreamer/WebPageProxyGStreamer.cpp:
(WebKit::WebPageProxy::requestInstallMissingMediaPlugins):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessPageClienth">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessgstreamerWebPageProxyGStreamercpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (195350 => 195351)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog        2016-01-20 12:38:08 UTC (rev 195350)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog        2016-01-20 12:43:07 UTC (rev 195351)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-18  Olivier Blin  &lt;olivier.blin@softathome.com&gt;
+
+        [EFL][GTK][WK2] Fix UIProcess build with GStreamer and without VIDEO
+        https://bugs.webkit.org/show_bug.cgi?id=153135
+
+        Reviewed by Michael Catanzaro.
+
+        GStreamer builds fail when WebAudio is enabled but VIDEO disabled.
+
+        This change makes the flag more consistent around the
+        decicePolicyForInstallMissingMediaPluginsPermissionRequest() method:
+        ENABLE(VIDEO) &amp;&amp; USE(GSTREAMER) everywhere, while the code used to
+        test either one or the other.
+
+        This does not enable InstallMissingMediaPlugins for WebAudio, since no
+        code makes use of this in WebKitWebAudioSourceGStreamer.
+
+        It also fixes a naming typo for the following method:
+        decidePolicyForInstallMissingMediaPluginsPermissionRequest()
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest):
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/PageClient.h:
+        * UIProcess/efl/WebViewEfl.h:
+        * UIProcess/gstreamer/WebPageProxyGStreamer.cpp:
+        (WebKit::WebPageProxy::requestInstallMissingMediaPlugins):
+
</ins><span class="cx"> 2015-12-07  Mario Sanchez Prada  &lt;mario@endlessm.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Allow applications to force Accelerated Compositing mode
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (195350 => 195351)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp        2016-01-20 12:38:08 UTC (rev 195350)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp        2016-01-20 12:43:07 UTC (rev 195351)
</span><span class="lines">@@ -450,8 +450,8 @@
</span><span class="cx">     g_object_unref(m_viewWidget);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(VIDEO)
-bool PageClientImpl::decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp; request)
</del><ins>+#if ENABLE(VIDEO) &amp;&amp; USE(GSTREAMER)
+bool PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp; request)
</ins><span class="cx"> {
</span><span class="cx">     if (!WEBKIT_IS_WEB_VIEW(m_viewWidget))
</span><span class="cx">         return false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (195350 => 195351)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h        2016-01-20 12:38:08 UTC (rev 195350)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h        2016-01-20 12:43:07 UTC (rev 195351)
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx">     virtual void refView() override;
</span><span class="cx">     virtual void derefView() override;
</span><span class="cx"> 
</span><del>-#if ENABLE(VIDEO)
-    virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp;) override;
</del><ins>+#if ENABLE(VIDEO) &amp;&amp; USE(GSTREAMER)
+    virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp;) override;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Members of PageClientImpl class
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/PageClient.h (195350 => 195351)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/PageClient.h        2016-01-20 12:38:08 UTC (rev 195350)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/PageClient.h        2016-01-20 12:43:07 UTC (rev 195351)
</span><span class="lines">@@ -341,8 +341,8 @@
</span><span class="cx">     virtual void refView() = 0;
</span><span class="cx">     virtual void derefView() = 0;
</span><span class="cx"> 
</span><del>-#if USE(GSTREAMER)
-    virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp;) = 0;
</del><ins>+#if ENABLE(VIDEO) &amp;&amp; USE(GSTREAMER)
+    virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&amp;) = 0;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessgstreamerWebPageProxyGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp (195350 => 195351)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp        2016-01-20 12:38:08 UTC (rev 195350)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp        2016-01-20 12:43:07 UTC (rev 195351)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> void WebPageProxy::requestInstallMissingMediaPlugins(const String&amp; details, const String&amp; description)
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;InstallMissingMediaPluginsPermissionRequest&gt; request = InstallMissingMediaPluginsPermissionRequest::create(*this, details, description);
</span><del>-    if (m_pageClient.decicePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
</del><ins>+    if (m_pageClient.decidePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     request-&gt;deny();
</span></span></pre>
</div>
</div>

</body>
</html>