[webkit-changes] [195231] trunk/Source/WebKit2

Mon, 18 Jan 2016 07:17:55 -0800

Title: [195231] trunk/Source/WebKit2
Revision
195231
Author
[email protected]
Date
2016-01-18 07:17:31 -0800 (Mon, 18 Jan 2016)

Log Message

[EFL][GTK][WK2] Fix UIProcess build with GStreamer and without VIDEO
https://bugs.webkit.org/show_bug.cgi?id=153135

Patch by Olivier Blin <[email protected]> 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: trunk/Source/WebKit2/ChangeLog (195230 => 195231)


--- trunk/Source/WebKit2/ChangeLog	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/ChangeLog	2016-01-18 15:17:31 UTC (rev 195231)
@@ -1,3 +1,31 @@
+2016-01-18  Olivier Blin  <[email protected]>
+
+        [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):
+
 2016-01-17  Jeremy Huddleston Sequoia  <[email protected]>
 
         Add quotes around ${CMAKE_SHARED_LINKER_FLAGS} in case it is unset

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (195230 => 195231)


--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp	2016-01-18 15:17:31 UTC (rev 195231)
@@ -439,8 +439,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: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (195230 => 195231)


--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h	2016-01-18 15:17:31 UTC (rev 195231)
@@ -141,8 +141,8 @@
 
     virtual void didRestoreScrollPosition() 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: trunk/Source/WebKit2/UIProcess/PageClient.h (195230 => 195231)


--- trunk/Source/WebKit2/UIProcess/PageClient.h	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h	2016-01-18 15:17:31 UTC (rev 195231)
@@ -352,8 +352,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
 
     virtual void didRestoreScrollPosition() = 0;

Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h (195230 => 195231)


--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h	2016-01-18 15:17:31 UTC (rev 195231)
@@ -95,8 +95,8 @@
 
     virtual void didRestoreScrollPosition() override final { }
 
-#if USE(GSTREAMER)
-    virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override final { return false; };
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+    virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override final { return false; };
 #endif
 
 private:

Modified: trunk/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp (195230 => 195231)


--- trunk/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp	2016-01-18 13:57:17 UTC (rev 195230)
+++ trunk/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp	2016-01-18 15:17:31 UTC (rev 195231)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to