Changeset 195231 in webkit

Timestamp:

Jan 18, 2016 7:17:31 AM (8 years ago)

Author:

commit-queue@webkit.org

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 <Olivier Blin> 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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/efl/WebViewEfl.h (modified) (1 diff)
• UIProcess/gstreamer/WebPageProxyGStreamer.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-18  Olivier Blin  <olivier.blin@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):
+
 2016-01-17  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

@@ -440 +440 @@
 }
 
-#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))

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h

@@ -142 +142 @@
     virtual void didRestoreScrollPosition() override { }
 
-#if ENABLE(VIDEO)
-    virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override;
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+    virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) override;
 #endif
 

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -353 +353 @@
     virtual void derefView() = 0;
 
-#if USE(GSTREAMER)
-    virtual bool decicePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) = 0;
+#if ENABLE(VIDEO) && USE(GSTREAMER)
+    virtual bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) = 0;
 #endif
 

trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h

@@ -96 +96 @@
     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
 

trunk/Source/WebKit2/UIProcess/gstreamer/WebPageProxyGStreamer.cpp

@@ -36 +36 @@
 {
     RefPtr<InstallMissingMediaPluginsPermissionRequest> request = InstallMissingMediaPluginsPermissionRequest::create(*this, details, description);
-    if (m_pageClient.decicePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
+    if (m_pageClient.decidePolicyForInstallMissingMediaPluginsPermissionRequest(*request))
         return;