Title: [181540] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 181540
- Author
- [email protected]
- Date
- 2015-03-16 04:13:42 -0700 (Mon, 16 Mar 2015)
Log Message
Merge r181449 - Stop using single-include headers that are only available since GStreamer >= 1.2.
https://bugs.webkit.org/show_bug.cgi?id=142537
Patch by Sebastian Dröge <[email protected]> on 2015-03-12
Reviewed by Philippe Normand.
* platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
* platform/graphics/gstreamer/GStreamerUtilities.h:
* platform/graphics/gstreamer/ImageGStreamer.h:
Instead of using single-include headers for the GStreamer libraries,
directly include the headers we need. The single-include headers were
only added in 1.2, and this would be the only reason why we would
depend on 1.2.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 11:13:42 UTC (rev 181540)
@@ -1,3 +1,23 @@
+2015-03-12 Sebastian Dröge <[email protected]>
+
+ Stop using single-include headers that are only available since GStreamer >= 1.2.
+
+ https://bugs.webkit.org/show_bug.cgi?id=142537
+
+ Reviewed by Philippe Normand.
+
+ * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ * platform/graphics/gstreamer/GStreamerUtilities.h:
+ * platform/graphics/gstreamer/ImageGStreamer.h:
+ Instead of using single-include headers for the GStreamer libraries,
+ directly include the headers we need. The single-include headers were
+ only added in 1.2, and this would be the only reason why we would
+ depend on 1.2.
+
2015-03-11 Geoffrey Garen <[email protected]>
Users of Heap::deprecatedReportExtraMemory should switch to reportExtraMemoryAllocated+reportExtraMemoryVisited
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2015-03-16 11:13:42 UTC (rev 181540)
@@ -29,7 +29,6 @@
#include "Logging.h"
#include "WebKitWebAudioSourceGStreamer.h"
#include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
#include <wtf/gobject/GUniquePtr.h>
namespace WebCore {
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-03-16 11:13:42 UTC (rev 181540)
@@ -27,9 +27,8 @@
#include <gio/gio.h>
#include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
#include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
#include <wtf/Noncopyable.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/gobject/GThreadSafeMainLoopSource.h>
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-03-16 11:13:42 UTC (rev 181540)
@@ -24,7 +24,7 @@
#include "AudioBus.h"
#include "AudioSourceProviderClient.h"
#include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
#include <gst/base/gstadapter.h>
#include <wtf/gobject/GMutexLocker.h>
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2015-03-16 11:13:42 UTC (rev 181540)
@@ -27,9 +27,9 @@
#include "AudioIOCallback.h"
#include "GRefPtrGStreamer.h"
#include "GStreamerUtilities.h"
-#include <gst/app/app.h>
-#include <gst/audio/audio.h>
-#include <gst/pbutils/pbutils.h>
+#include <gst/app/gstappsrc.h>
+#include <gst/audio/audio-info.h>
+#include <gst/pbutils/missing-plugins.h>
#include <wtf/gobject/GUniquePtr.h>
using namespace WebCore;
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-03-16 11:13:42 UTC (rev 181540)
@@ -24,8 +24,9 @@
#include "IntSize.h"
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
#include <gst/gst.h>
+#include <gst/video/video-info.h>
#include <wtf/MathExtras.h>
#include <wtf/gobject/GUniquePtr.h>
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2015-03-16 11:13:42 UTC (rev 181540)
@@ -19,7 +19,7 @@
#include "Logging.h"
#include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-format.h>
#define LOG_MEDIA_MESSAGE(...) do { \
GST_DEBUG(__VA_ARGS__); \
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h (181539 => 181540)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2015-03-16 10:43:35 UTC (rev 181539)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h 2015-03-16 11:13:42 UTC (rev 181540)
@@ -27,7 +27,7 @@
#include "GRefPtrGStreamer.h"
#include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-frame.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
