Title: [202854] trunk/Source/WebCore
- Revision
- 202854
- Author
- [email protected]
- Date
- 2016-07-06 02:48:01 -0700 (Wed, 06 Jul 2016)
Log Message
[GTK] Better guard TextureMapper header and CMake includes
https://bugs.webkit.org/show_bug.cgi?id=159415
Reviewed by Carlos Garcia Campos.
* PlatformGTK.cmake: Only include TextureMapper.cmake if USE_TEXTURE_MAPPER is enabled.
* platform/graphics/GraphicsContext3DPrivate.h: Guard texmap header inclusions with USE(TEXTURE_MAPPER).
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Ditto, but wrap it around
the existing USE(TEXTURE_MAPPER_GL) block.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202853 => 202854)
--- trunk/Source/WebCore/ChangeLog 2016-07-06 06:54:52 UTC (rev 202853)
+++ trunk/Source/WebCore/ChangeLog 2016-07-06 09:48:01 UTC (rev 202854)
@@ -1,3 +1,15 @@
+2016-07-06 Zan Dobersek <[email protected]>
+
+ [GTK] Better guard TextureMapper header and CMake includes
+ https://bugs.webkit.org/show_bug.cgi?id=159415
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake: Only include TextureMapper.cmake if USE_TEXTURE_MAPPER is enabled.
+ * platform/graphics/GraphicsContext3DPrivate.h: Guard texmap header inclusions with USE(TEXTURE_MAPPER).
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Ditto, but wrap it around
+ the existing USE(TEXTURE_MAPPER_GL) block.
+
2016-07-05 Olivier Blin <[email protected]>
[GStreamer] Do not build MediaPlayerPrivateGStreamerOwr when VIDEO is disabled
Modified: trunk/Source/WebCore/PlatformGTK.cmake (202853 => 202854)
--- trunk/Source/WebCore/PlatformGTK.cmake 2016-07-06 06:54:52 UTC (rev 202853)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-07-06 09:48:01 UTC (rev 202854)
@@ -1,8 +1,11 @@
include(platform/GStreamer.cmake)
include(platform/ImageDecoders.cmake)
include(platform/Linux.cmake)
-include(platform/TextureMapper.cmake)
+if (USE_TEXTURE_MAPPER)
+ include(platform/TextureMapper.cmake)
+endif ()
+
set(WebCore_OUTPUT_NAME WebCoreGTK)
list(APPEND WebCore_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h (202853 => 202854)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h 2016-07-06 06:54:52 UTC (rev 202853)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h 2016-07-06 09:48:01 UTC (rev 202854)
@@ -23,8 +23,11 @@
#include "GLContext.h"
#include "GraphicsContext3D.h"
#include "PlatformLayer.h"
+
+#if USE(TEXTURE_MAPPER)
#include "TextureMapperPlatformLayer.h"
#include "TextureMapperPlatformLayerProxy.h"
+#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (202853 => 202854)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-07-06 06:54:52 UTC (rev 202853)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-07-06 09:48:01 UTC (rev 202854)
@@ -28,15 +28,18 @@
#include "MainThreadNotifier.h"
#include "MediaPlayerPrivate.h"
#include "PlatformLayer.h"
-#include "TextureMapperPlatformLayer.h"
-#include "TextureMapperPlatformLayerProxy.h"
#include <glib.h>
#include <wtf/Condition.h>
#include <wtf/Forward.h>
#include <wtf/RunLoop.h>
+
+#if USE(TEXTURE_MAPPER)
+#include "TextureMapperPlatformLayer.h"
+#include "TextureMapperPlatformLayerProxy.h"
#if USE(TEXTURE_MAPPER_GL)
#include "TextureMapperGL.h"
#endif
+#endif
typedef struct _GstBaseSink GstBaseSink;
typedef struct _GstMessage GstMessage;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
