Title: [195351] releases/WebKitGTK/webkit-2.10/Source/WebKit2
- Revision
- 195351
- Author
- carlo...@webkit.org
- Date
- 2016-01-20 04:43:07 -0800 (Wed, 20 Jan 2016)
Log Message
Merge r195231 - [EFL][GTK][WK2] Fix UIProcess build with GStreamer and without VIDEO
https://bugs.webkit.org/show_bug.cgi?id=153135
Patch by Olivier Blin <olivier.b...@softathome.com> 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) && 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (195350 => 195351)
--- 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)
@@ -1,3 +1,31 @@
+2016-01-18 Olivier Blin <olivier.b...@softathome.com>
+
+ [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) && 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):
+
2015-12-07 Mario Sanchez Prada <ma...@endlessm.com>
[GTK] Allow applications to force Accelerated Compositing mode
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (195350 => 195351)
--- 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)
@@ -450,8 +450,8 @@
g_object_unref(m_viewWidget);
}
-#if ENABLE(VIDEO)
-bool PageClientImpl::decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest& request)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+bool PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest& request)
{
if (!WEBKIT_IS_WEB_VIEW(m_viewWidget))
return false;
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (195350 => 195351)
--- 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)
@@ -145,8 +145,8 @@
virtual void refView() override;
virtual void derefView() override;
-#if ENABLE(VIDEO)
- virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override;
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+ virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override;
#endif
// Members of PageClientImpl class
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/PageClient.h (195350 => 195351)
--- 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)
@@ -341,8 +341,8 @@
virtual void refView() = 0;
virtual void derefView() = 0;
-#if USE(GSTREAMER)
- virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) = 0;
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+ virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) = 0;
#endif
};
Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp (195350 => 195351)
--- 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)
@@ -35,7 +35,7 @@
void WebPageProxy::requestInstallMissingMediaPlugins(const String& details, const String& description)
{
RefPtr<InstallMissingMediaPluginsPermissionRequest> request = InstallMissingMediaPluginsPermissionRequest::create(*this, details, description);
- if (m_pageClient.decicePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
+ if (m_pageClient.decidePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
return;
request->deny();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
