Title: [246258] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 246258
- Author
- [email protected]
- Date
- 2019-06-10 07:38:47 -0700 (Mon, 10 Jun 2019)
Log 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (246257 => 246258)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-06-10 14:04:12 UTC (rev 246257)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-06-10 14:38:47 UTC (rev 246258)
@@ -1,3 +1,13 @@
+2019-05-23 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.24.2 release
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (246257 => 246258)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-06-10 14:04:12 UTC (rev 246257)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-06-10 14:38:47 UTC (rev 246258)
@@ -31,7 +31,11 @@
#include "WebMemoryPressureHandler.h"
#include "WebProcessCreationParameters.h"
#include <_javascript_Core/RemoteInspectorServer.h>
+
+#if USE(GSTREAMER)
#include <WebCore/GStreamerCommon.h>
+#endif
+
#include <wtf/FileSystem.h>
#include <wtf/glib/GUniquePtr.h>
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp (246257 => 246258)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2019-06-10 14:04:12 UTC (rev 246257)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2019-06-10 14:38:47 UTC (rev 246258)
@@ -28,7 +28,11 @@
#include "WebProcess.h"
#include "WebProcessCreationParameters.h"
+
+#if USE(GSTREAMER)
#include <WebCore/GStreamerCommon.h>
+#endif
+
#include <WebCore/MemoryCache.h>
#if PLATFORM(WAYLAND)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes