Changeset 202854 in webkit

Timestamp:

Jul 6, 2016 2:48:01 AM (8 years ago)

Author:

zandobersek@gmail.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (1 diff)
• platform/graphics/GraphicsContext3DPrivate.h (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -2 +2 @@
 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)

trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h

@@ -24 +24 @@
 #include "GraphicsContext3D.h"
 #include "PlatformLayer.h"
+
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperPlatformLayer.h"
 #include "TextureMapperPlatformLayerProxy.h"
+#endif
 
 namespace WebCore {

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

@@ -29 +29 @@
 #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