<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195736] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195736">195736</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2016-01-28 07:16:02 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195735 => 195736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-01-28 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><ins>+ [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 <yoon@igalia.com>
+
</ins><span class="cx"> [GStreamer] MediaPlayerPrivateGStreamerBase::handleSyncMessage leaks GstContext
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153580
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (195735 => 195736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,26 +46,10 @@
</span><span class="cx">
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><span class="cx"> #define GST_USE_UNSTABLE_API
</span><del>-#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
</del><span class="cx"> #include <gst/gl/gl.h>
</span><span class="cx"> #undef GST_USE_UNSTABLE_API
</span><span class="cx">
</span><ins>+#include "GLContext.h"
</ins><span class="cx"> #if USE(GLX)
</span><span class="cx"> #include "GLContextGLX.h"
</span><span class="cx"> #include <gst/gl/x11/gstgldisplay_x11.h>
</span><span class="lines">@@ -84,9 +68,18 @@
</span><span class="cx"> // defines None, breaking MediaPlayer::None enum
</span><span class="cx"> #if PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
</span><span class="cx"> #undef None
</span><del>-#endif
</del><ins>+#endif // PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
</ins><span class="cx"> #endif // USE(GSTREAMER_GL)
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> #if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> #include <cairo-gl.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -166,7 +159,7 @@
</span><span class="cx"> GLuint m_textureID;
</span><span class="cx"> bool m_isValid { false };
</span><span class="cx"> };
</span><del>-#endif
</del><ins>+#endif // USE(COORDINATED_GRAPHICS_THREADED) && USE(GSTREAMER_GL)
</ins><span class="cx">
</span><span class="cx"> MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase(MediaPlayer* player)
</span><span class="cx"> : m_player(player)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (195735 => 195736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(GSTREAMER_GL)
</span><del>- virtual PassNativeImagePtr nativeImageForCurrentTime();
</del><ins>+ virtual PassNativeImagePtr nativeImageForCurrentTime() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195735 => 195736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-28 09:06:30 UTC (rev 195735)
+++ trunk/Tools/ChangeLog 2016-01-28 15:16:02 UTC (rev 195736)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-28 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [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.
+
</ins><span class="cx"> 2016-01-27 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove unused accessibility related code
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (195735 => 195736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -173,6 +173,11 @@
</span><span class="cx"> os.path.join('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')],
</span><span class="cx"> ["-readability/enum_casing"]),
</span><span class="cx">
</span><ins>+ ([# 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"]),
+
</ins><span class="cx"> ([# Header files in ForwardingHeaders have no header guards or
</span><span class="cx"> # exceptional header guards (e.g., WebCore_FWD_Debugger_h).
</span><span class="cx"> os.path.join(os.path.sep, 'ForwardingHeaders')],
</span><span class="lines">@@ -227,7 +232,6 @@
</span><span class="cx"> os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMEventTarget.cpp'),
</span><span class="cx"> os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMNodeFilter.cpp'),
</span><span class="cx"> os.path.join('Source', 'WebCore', 'bindings', 'gobject', 'WebKitDOMXPathNSResolver.cpp'),
</span><del>- os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'VideoSinkGStreamer1.cpp'),
</del><span class="cx"> os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'VideoSinkGStreamer.cpp'),
</span><span class="cx"> os.path.join('Source', 'WebCore', 'platform', 'graphics', 'gstreamer', 'WebKitWebSourceGStreamer.cpp'),
</span><span class="cx"> os.path.join('Source', 'WebCore', 'platform', 'audio', 'gstreamer', 'WebKitWebAudioSourceGStreamer.cpp'),
</span></span></pre>
</div>
</div>
</body>
</html>