Changeset 246258 in webkit

Timestamp:

Jun 10, 2019, 7:38:47 AM (7 years ago)

Author:

Adrian Perez de Castro

Message:

Merged r245676 - [WPE] Build fails with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
​https://bugs.webkit.org/show_bug.cgi?id=198125

Reviewed by Philippe Normand.

• UIProcess/glib/WebProcessPoolGLib.cpp: Guard the inclusion of GStreamerCommon.h with USE(GSTREAMER).
• WebProcess/glib/WebProcessGLib.cpp: Ditto.

Location:

releases/WebKitGTK/webkit-2.24/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/glib/WebProcessPoolGLib.cpp (modified) (1 diff)
• WebProcess/glib/WebProcessGLib.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-23  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Build fails with ENABLE_VIDEO=OFF and ENABLE_WEB_AUDIO=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=198125
+
+        Reviewed by Philippe Normand.
+
+        * UIProcess/glib/WebProcessPoolGLib.cpp: Guard the inclusion of GStreamerCommon.h with USE(GSTREAMER).
+        * WebProcess/glib/WebProcessGLib.cpp: Ditto.
+
 2019-05-20  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp

@@ -32 +32 @@
 #include "WebProcessCreationParameters.h"
 #include <JavaScriptCore/RemoteInspectorServer.h>
+
+#if USE(GSTREAMER)
 #include <WebCore/GStreamerCommon.h>
+#endif
+
 #include <wtf/FileSystem.h>
 #include <wtf/glib/GUniquePtr.h>

releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp

@@ -29 +29 @@
 
 #include "WebProcessCreationParameters.h"
+
+#if USE(GSTREAMER)
 #include <WebCore/GStreamerCommon.h>
+#endif
+
 #include <WebCore/MemoryCache.h>