[GTK] Better guard TextureMapper header and CMake includes
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jul 2016 09:48:01 +0000 (09:48 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jul 2016 09:48:01 +0000 (09:48 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

index 56bf54a..4715493 100644 (file)
@@ -1,3 +1,15 @@
+2016-07-06  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <olivier.blin@softathome.com>
 
         [GStreamer] Do not build MediaPlayerPrivateGStreamerOwr when VIDEO is disabled
index 74e5195..c22405b 100644 (file)
@@ -1,7 +1,10 @@
 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)
 
index 593fc56..d74611a 100644 (file)
 #include "GLContext.h"
 #include "GraphicsContext3D.h"
 #include "PlatformLayer.h"
+
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperPlatformLayer.h"
 #include "TextureMapperPlatformLayerProxy.h"
+#endif
 
 namespace WebCore {
 
index d6bd904..a461f5e 100644 (file)
 #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;