commit 9aa246444fa55bfbce4d88843583f192d2a758f5
author don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 13 19:09:04 2019 +0000
committer don.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 13 19:09:04 2019 +0000
tree 5aa02dd211406a0f1929eff3a29e56aef15eacc4
parent 015240ab804c8175142317cbd0a2507a97d46742

decidePolicyForInstallMissingMediaPluginsPermissionRequest requires GStreamer
https://bugs.webkit.org/show_bug.cgi?id=197843

Reviewed by Alex Christensen.

* UIProcess/API/wpe/PageClientImpl.cpp:
ENABLE(VIDEO) && USE(GSTREAMER)
* UIProcess/WebPageProxy.h:
Cleanup the declaration.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 5807e13..d2b662b 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2019-05-13  Don Olmstead  <don.olmstead@sony.com>
 
+        decidePolicyForInstallMissingMediaPluginsPermissionRequest requires GStreamer
+        https://bugs.webkit.org/show_bug.cgi?id=197843
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/API/wpe/PageClientImpl.cpp:
+        ENABLE(VIDEO) && USE(GSTREAMER)
+        * UIProcess/WebPageProxy.h:
+        Cleanup the declaration.
+
+2019-05-13  Don Olmstead  <don.olmstead@sony.com>
+
         Move StorageManager.cpp into WebKit/Sources.txt
         https://bugs.webkit.org/show_bug.cgi?id=197842
 

Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp

diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
index d05b42f..a91ff0f 100644
--- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
+++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
@@ -334,7 +334,7 @@
 {
 }
 
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 bool PageClientImpl::decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&)
 {
     return false;

Source/WebKit/UIProcess/WebPageProxy.h

diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
index 8d8fe81..5809fcf 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -1986,11 +1986,9 @@
     void fixedLayoutSizeDidChange(WebCore::IntSize fixedLayoutSize) { m_fixedLayoutSize = fixedLayoutSize; }
 
     void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&);
-#if ENABLE(VIDEO)
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
     void requestInstallMissingMediaPlugins(const String& details, const String& description);
 #endif
-#endif
 
     void startURLSchemeTask(URLSchemeTaskParameters&&);
     void stopURLSchemeTask(uint64_t handlerIdentifier, uint64_t taskIdentifier);