Log Message
[GStreamer] Clean up includes and headers related with GStreamerGL https://bugs.webkit.org/show_bug.cgi?id=153590
Reviewed by Philippe Normand. Source/WebCore: Remove gstglmemory from the including list and reorder includes to organize GSTREAMER_GL related headers. It violates style rules of the include order, but there is no clean way to include gst/gl/gl.h without violating it. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Tools: * Scripts/webkitpy/style/checker.py: Skips include_order check for MediaPlayerPrivateGStreamerBase.cpp Removes VideoSinkGStreamer1.cpp which doesn't exist anymore.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195735 => 195736)
--- trunk/Source/WebCore/ChangeLog 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Source/WebCore/ChangeLog 2016-01-28 15:16:02 UTC (rev 195736)
@@ -1,5 +1,20 @@
2016-01-28 Gwang Yoon Hwang <[email protected]>
+ [GStreamer] Clean up includes and headers related with GStreamerGL
+ https://bugs.webkit.org/show_bug.cgi?id=153590
+
+ Reviewed by Philippe Normand.
+
+ Remove gstglmemory from the including list and reorder includes to
+ organize GSTREAMER_GL related headers. It violates style rules of the
+ include order, but there is no clean way to include gst/gl/gl.h
+ without violating it.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
+2016-01-28 Gwang Yoon Hwang <[email protected]>
+
[GStreamer] MediaPlayerPrivateGStreamerBase::handleSyncMessage leaks GstContext
https://bugs.webkit.org/show_bug.cgi?id=153580
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (195735 => 195736)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-01-28 15:16:02 UTC (rev 195736)
@@ -46,26 +46,10 @@
#if USE(GSTREAMER_GL)
#define GST_USE_UNSTABLE_API
-#include <gst/gl/gstglmemory.h>
-#undef GST_USE_UNSTABLE_API
-#endif
-
-#if GST_CHECK_VERSION(1, 1, 0) && USE(TEXTURE_MAPPER_GL)
-#include "BitmapTextureGL.h"
-#include "BitmapTexturePool.h"
-#include "TextureMapperGL.h"
-#endif
-#if USE(COORDINATED_GRAPHICS_THREADED)
-#include "TextureMapperPlatformLayerBuffer.h"
-#endif
-
-#if USE(GSTREAMER_GL)
-#include "GLContext.h"
-
-#define GST_USE_UNSTABLE_API
#include <gst/gl/gl.h>
#undef GST_USE_UNSTABLE_API
+#include "GLContext.h"
#if USE(GLX)
#include "GLContextGLX.h"
#include <gst/gl/x11/gstgldisplay_x11.h>
@@ -84,9 +68,18 @@
// defines None, breaking MediaPlayer::None enum
#if PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
#undef None
-#endif
+#endif // PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
#endif // USE(GSTREAMER_GL)
+#if GST_CHECK_VERSION(1, 1, 0) && USE(TEXTURE_MAPPER_GL)
+#include "BitmapTextureGL.h"
+#include "BitmapTexturePool.h"
+#include "TextureMapperGL.h"
+#endif
+#if USE(COORDINATED_GRAPHICS_THREADED)
+#include "TextureMapperPlatformLayerBuffer.h"
+#endif
+
#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
#include <cairo-gl.h>
#endif
@@ -166,7 +159,7 @@
GLuint m_textureID;
bool m_isValid { false };
};
-#endif
+#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(GSTREAMER_GL)
MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase(MediaPlayer* player)
: m_player(player)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (195735 => 195736)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-01-28 15:16:02 UTC (rev 195736)
@@ -119,7 +119,7 @@
#endif
#if USE(GSTREAMER_GL)
- virtual PassNativeImagePtr nativeImageForCurrentTime();
+ virtual PassNativeImagePtr nativeImageForCurrentTime() override;
#endif
protected:
Modified: trunk/Tools/ChangeLog (195735 => 195736)
--- trunk/Tools/ChangeLog 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Tools/ChangeLog 2016-01-28 15:16:02 UTC (rev 195736)
@@ -1,3 +1,14 @@
+2016-01-28 Gwang Yoon Hwang <[email protected]>
+
+ [GStreamer] Clean up includes and headers related with GStreamerGL
+ https://bugs.webkit.org/show_bug.cgi?id=153590
+
+ Reviewed by Philippe Normand.
+
+ * Scripts/webkitpy/style/checker.py: Skips
+ include_order check for MediaPlayerPrivateGStreamerBase.cpp
+ Removes VideoSinkGStreamer1.cpp which doesn't exist anymore.
+
2016-01-27 Krzysztof Czech <[email protected]>
[EFL] Remove unused accessibility related code
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (195735 => 195736)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2016-01-28 15:16:02 UTC (rev 195736)
@@ -173,6 +173,11 @@
os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')],
["-readability/enum_casing"]),
+ ([# To use GStreamer GL without conflicts of GL symbols,
+ # we should include gst/gl/gl.h before including OpenGL[ES]Shims
+ os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'MediaPlayerPrivateGStreamerBase.cpp')],
+ ["-build/include_order"]),
+
([# Header files in ForwardingHeaders have no header guards or
# exceptional header guards (e.g., WebCore_FWD_Debugger_h).
os.path.join(os.path.sep, 'ForwardingHeaders')],
@@ -227,7 +232,6 @@
os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMEventTarget.cpp'),
os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMNodeFilter.cpp'),
os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMXPathNSResolver.cpp'),
- os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'VideoSinkGStreamer1.cpp'),
os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'VideoSinkGStreamer.cpp'),
os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'WebKitWebSourceGStreamer.cpp'),
os.path.join('Source', 'WebCore', 'platform', 'audio', 'gstreamer', 'WebKitWebAudioSourceGStreamer.cpp'),
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
